commit c06a8d69b50384113df4a17824c68bbfce7fb578
author Jason Monk <jmonk@google.com> Mon Aug 19 10:36:23 2013 -0400
committer Jason Monk <jmonk@google.com> Mon Aug 19 10:36:23 2013 -0400
tree 7b452b9edf872f5086e5c23d75c1097c2f33b111
parent f5cf6e34aa6c6b061eb6f33f2f82c95177e16648

Fix memory leak in shutdown.

Frees associated objects when resolver is deleted.

Bug: 10387401
Change-Id: I38cbed74001ecb56c618dcc52120d56260502427

src/proxy_resolver_v8.cc

diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc
index 21e3e0c..ee0510b 100644
--- a/src/proxy_resolver_v8.cc
+++ b/src/proxy_resolver_v8.cc
@@ -689,7 +689,13 @@
 }
 
 ProxyResolverV8::~ProxyResolverV8() {
-
+  if (context_ != NULL) {
+    delete context_;
+    context_ = NULL;
+  }
+  if (js_bindings_ != NULL) {
+    delete js_bindings_;
+  }
 }
 
 int ProxyResolverV8::GetProxyForURL(const android::String16 spec, const android::String16 host,
@@ -705,22 +711,14 @@
   return rv;
 }
 
-void ProxyResolverV8::CancelRequest(RequestHandle request) {
-}
-
-void ProxyResolverV8::CancelSetPacScript() {
-}
-
 void ProxyResolverV8::PurgeMemory() {
   context_->PurgeMemory();
 }
 
-void ProxyResolverV8::Shutdown() {
-}
-
 int ProxyResolverV8::SetPacScript(android::String16& script_data) {
   if (context_ != NULL) {
     delete context_;
+    context_ = NULL;
   }
   if (script_data.size() == 0)
     return ERR_PAC_SCRIPT_FAILED;