commit 3560907fa9b1624eefbd6db5e9c3ccc25ab23b92
author Tim Murray <timmurray@google.com> Tue Dec 03 11:36:03 2013 -0800
committer Tim Murray <timmurray@google.com> Thu Dec 12 10:49:20 2013 -0800
tree bba012b2f33550dcbf260de7b13dc080641871e8
parent 071aee6b0cffde1ce3ece5e32e34361db2105547

Fix memory leak due to smart pointer misuse.

bug 11965932

Change-Id: I982b974b3554b0f4dc7a558107703ff605f580e6

cpp/BaseObj.cpp

diff --git a/cpp/BaseObj.cpp b/cpp/BaseObj.cpp
index 80d9414..2e0a637 100644
--- a/cpp/BaseObj.cpp
+++ b/cpp/BaseObj.cpp
@@ -33,7 +33,7 @@
 
 
 BaseObj::BaseObj(void *id, sp<RS> rs) {
-    mRS = rs;
+    mRS = rs.get();
     mID = id;
 }
 
@@ -44,7 +44,9 @@
 }
 
 BaseObj::~BaseObj() {
-    RS::dispatch->ObjDestroy(mRS->getContext(), mID);
+    if (mRS && mRS->getContext()) {
+        RS::dispatch->ObjDestroy(mRS->getContext(), mID);
+    }
     mRS = NULL;
     mID = NULL;
 }