Properly close providers.json file stream. (#12794)

matrix-org · May 19, 2022 · 684feea · 684feea
1 parent 66a5f6c
commit 684feea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/changelog.d/12794.bugfix b/changelog.d/12794.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in 1.43.0 where a file (`providers.json`) was never closed. Contributed by @arkamar.
diff --git a/synapse/config/oembed.py b/synapse/config/oembed.py
@@ -57,9 +57,9 @@ def _parse_and_validate_providers(
         """
         # Whether to use the packaged providers.json file.
         if not oembed_config.get("disable_default_providers") or False:
-            providers = json.load(
-                pkg_resources.resource_stream("synapse", "res/providers.json")
-            )
+            with pkg_resources.resource_stream("synapse", "res/providers.json") as s:
+                providers = json.load(s)
+
             yield from self._parse_and_validate_provider(
                 providers, config_path=("oembed",)
             )