[tor-commits] [tor-browser/tor-browser-52.5.2esr-7.5-2] Bug 24398: Plugin-container process exhausts memory

gk at torproject.org gk at torproject.org
Wed Dec 13 14:21:07 UTC 2017


commit cef2fe28a238d7e445d7c5b4292bfe27c1b71bca
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Dec 13 14:15:57 2017 +0000

    Bug 24398: Plugin-container process exhausts memory
    
    The plugin-container process can thrash/crash due to increasing memory
    consumption after our workaround for bug 24052. The patch provided by a
    cypherpunk (bug thanks!) deals with that as far as the Developer Tools
    are concerned.
---
 devtools/shared/DevToolsUtils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/devtools/shared/DevToolsUtils.js b/devtools/shared/DevToolsUtils.js
index d44184fd6b8e..926420154fe5 100644
--- a/devtools/shared/DevToolsUtils.js
+++ b/devtools/shared/DevToolsUtils.js
@@ -559,7 +559,8 @@ function newChannelForURL(url, { policy, window, principal }) {
 
   try {
     return NetUtil.newChannel(channelOptions);
-  } catch (e) {
+  } catch (e if e.name === "NS_ERROR_UNKNOWN_PROTOCOL" &&
+                !(url.startsWith("file://"))) {
     // In xpcshell tests on Windows, nsExternalProtocolHandler::NewChannel()
     // can throw NS_ERROR_UNKNOWN_PROTOCOL if the external protocol isn't
     // supported by Windows, so we also need to handle the exception here if



More information about the tor-commits mailing list