From 7b64bbb3325b363564af49c4a313b1e2b8a2fc46 Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Sun, 13 Jan 2013 05:30:15 +0900 Subject: [PATCH] Bug 829518 - Enclose InternetQueryOptionW in __try...__except to suppress crash. r=mcmanus --- .../system/windowsproxy/nsWindowsSystemProxySettings.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp b/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp index 122484f35a76..7d57ac7ba3a8 100644 --- a/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp +++ b/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp @@ -91,8 +91,12 @@ static nsresult ReadInternetOption(uint32_t aOption, uint32_t& aFlags, } options[0].dwOption = INTERNET_PER_CONN_FLAGS; size = sizeof(INTERNET_PER_CONN_OPTION_LISTW); - if (!InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, - &list, &size)) { + __try { + if (!InternetQueryOptionW(NULL, INTERNET_OPTION_PER_CONNECTION_OPTION, + &list, &size)) { + return NS_ERROR_FAILURE; + } + } __except (EXCEPTION_EXECUTE_HANDLER) { return NS_ERROR_FAILURE; } }