From 6838f67f34b601640e4dd94d9081956f8b2d83e5 Mon Sep 17 00:00:00 2001 From: Minju Kim Date: Fri, 7 Feb 2014 15:37:19 +0100 Subject: 8 bytes memory leaks in WebProcessMainQt.cpp when proxy is initialized https://bugs.webkit.org/show_bug.cgi?id=118515 Patch by Minju Kim on 2013-09-25 Reviewed by Christophe Dumez. * WebProcess/qt/WebProcessMainQt.cpp: (WebKit::initializeProxy): Handled EnvHttpProxyFactory by using OwnPtr to avoid memory leak when it isn't handled by NetworkProxyFactory Change-Id: I51833871d8e11441ffe60d51629814e64f77d792 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156449 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning --- Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp index ccd93a97f..474b6c6fe 100644 --- a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp +++ b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp @@ -132,9 +132,9 @@ static void initializeProxy() if (proxylist.count() == 1) { QNetworkProxy proxy = proxylist.first(); if (proxy == QNetworkProxy::NoProxy || proxy == QNetworkProxy::DefaultProxy) { - EnvHttpProxyFactory* proxyFactory = new EnvHttpProxyFactory(); + OwnPtr proxyFactory = adoptPtr(new EnvHttpProxyFactory()); if (proxyFactory->initializeFromEnvironment()) { - QNetworkProxyFactory::setApplicationProxyFactory(proxyFactory); + QNetworkProxyFactory::setApplicationProxyFactory(proxyFactory.leakPtr()); return; } } -- cgit v1.2.1