commit 7d2a6e85c570e574457d1862c9e16025094d09e7
author Tim Murray <timmurray@google.com> Tue Dec 03 11:36:03 2013 -0800
committer Tim Murray <timmurray@google.com> Thu Mar 20 21:34:21 2014 -0700
tree 59130f11b0b2db5d1f0bc52eec3745c9665d7648
parent 5c89f711c8a50563f10daf1771814988582a4af3

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;
 }

cpp/Element.cpp

diff --git a/cpp/Element.cpp b/cpp/Element.cpp
index d3fb29a..ce84699 100644
--- a/cpp/Element.cpp
+++ b/cpp/Element.cpp
@@ -358,7 +358,7 @@
 }
 
 Element::Builder::Builder(android::RSC::sp<RS> rs) {
-    mRS = rs;
+    mRS = rs.get();
     mSkipPadding = false;
 }
 

cpp/Type.cpp

diff --git a/cpp/Type.cpp b/cpp/Type.cpp
index 07da0c5..d053730 100644
--- a/cpp/Type.cpp
+++ b/cpp/Type.cpp
@@ -116,7 +116,7 @@
 }
 
 Type::Builder::Builder(sp<RS> rs, sp<const Element> e) {
-    mRS = rs;
+    mRS = rs.get();
     mElement = e;
     mDimX = 0;
     mDimY = 0;

cpp/rsCppStructs.h

diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index 1efd128..8fb18cd 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -260,7 +260,7 @@
 
 protected:
     void *mID;
-    sp<RS> mRS;
+    RS* mRS;
     std::string mName;
 
     BaseObj(void *id, sp<RS> rs);
@@ -1031,7 +1031,7 @@
      */
     class Builder {
     private:
-        sp<RS> mRS;
+        RS* mRS;
         std::vector<sp<Element> > mElements;
         std::vector<std::string> mElementNames;
         std::vector<uint32_t> mArraySizes;
@@ -1285,7 +1285,7 @@
 
     class Builder {
     protected:
-        sp<RS> mRS;
+        RS* mRS;
         uint32_t mDimX;
         uint32_t mDimY;
         uint32_t mDimZ;