Title: [280759] trunk/Tools
Revision
280759
Author
aakash_j...@apple.com
Date
2021-08-07 13:55:22 -0700 (Sat, 07 Aug 2021)

Log Message

[ews] Ensure file handle is not leaked in loadConfig.py
https://bugs.webkit.org/show_bug.cgi?id=228866

Reviewed by Alexey Proskuryakov.

* CISupport/build-webkit-org/loadConfig.py:
(loadBuilderConfig):
* CISupport/ews-build/loadConfig.py:
(loadBuilderConfig):

Modified Paths

Diff

Modified: trunk/Tools/CISupport/build-webkit-org/loadConfig.py (280758 => 280759)


--- trunk/Tools/CISupport/build-webkit-org/loadConfig.py	2021-08-07 18:50:12 UTC (rev 280758)
+++ trunk/Tools/CISupport/build-webkit-org/loadConfig.py	2021-08-07 20:55:22 UTC (rev 280759)
@@ -47,8 +47,8 @@
 
 
 def loadBuilderConfig(c, is_test_mode_enabled=False, master_prefix_path='./'):
-    # FIXME: These file handles are leaked.
-    config = json.load(open(os.path.join(master_prefix_path, 'config.json')))
+    with open(os.path.join(master_prefix_path, 'config.json')) as config_json:
+        config = json.load(config_json)
     if is_test_mode_enabled:
         passwords = {}
     else:

Modified: trunk/Tools/CISupport/ews-build/loadConfig.py (280758 => 280759)


--- trunk/Tools/CISupport/ews-build/loadConfig.py	2021-08-07 18:50:12 UTC (rev 280758)
+++ trunk/Tools/CISupport/ews-build/loadConfig.py	2021-08-07 20:55:22 UTC (rev 280759)
@@ -42,7 +42,8 @@
 
 
 def loadBuilderConfig(c, is_test_mode_enabled=False, master_prefix_path='./'):
-    config = json.load(open(os.path.join(master_prefix_path, 'config.json')))
+    with open(os.path.join(master_prefix_path, 'config.json')) as config_json:
+        config = json.load(config_json)
     if is_test_mode_enabled:
         passwords = {}
     else:

Modified: trunk/Tools/ChangeLog (280758 => 280759)


--- trunk/Tools/ChangeLog	2021-08-07 18:50:12 UTC (rev 280758)
+++ trunk/Tools/ChangeLog	2021-08-07 20:55:22 UTC (rev 280759)
@@ -1,3 +1,15 @@
+2021-08-07  Aakash Jain  <aakash_j...@apple.com>
+
+        [ews] Ensure file handle is not leaked in loadConfig.py
+        https://bugs.webkit.org/show_bug.cgi?id=228866
+
+        Reviewed by Alexey Proskuryakov.
+
+        * CISupport/build-webkit-org/loadConfig.py:
+        (loadBuilderConfig):
+        * CISupport/ews-build/loadConfig.py:
+        (loadBuilderConfig):
+
 2021-08-06  Jonathan Bedard  <jbed...@apple.com>
 
         [git-webkit] Add setup function
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to