Merge "Free resources in correct order in ResStringPool::uninit"

2012-11-14 09:33:48 -08:00
parent 87ed0a10f5 a1d82ff393
commit be37b5fa24
1 changed files with 4 additions and 4 deletions
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -506,10 +506,6 @@ status_t ResStringPool::getError() const
 void ResStringPool::uninit()
 {
    mError = NO_INIT;
-    if (mOwnedData) {
-        free(mOwnedData);
-        mOwnedData = NULL;
-    }
    if (mHeader != NULL && mCache != NULL) {
        for (size_t x = 0; x < mHeader->stringCount; x++) {
            if (mCache[x] != NULL) {
@@ -520,6 +516,10 @@ void ResStringPool::uninit()
        free(mCache);
        mCache = NULL;
    }
+    if (mOwnedData) {
+        free(mOwnedData);
+        mOwnedData = NULL;
+    }
 }

 /**