summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2014-06-17 19:13:58 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-06-17 19:13:58 +0000
commitf5cb96cfbbd2a7148b4b337097c94bea3f52d5f3 (patch)
treee6cda57429240deef098fc7084b2079ea7b3a638 /libs/androidfw/AssetManager.cpp
parentaa3ebacd4f7cd7ecf02291114c109a4cd3d1d27a (diff)
parent51736de19a4c225a54cda73754d0f57aa68def4f (diff)
am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug"
* commit '51736de19a4c225a54cda73754d0f57aa68def4f': [Asset Manager] Fix memory leakage bug
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
-rw-r--r--libs/androidfw/AssetManager.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index b4d482ad0a54..87164ca2f5aa 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -1747,6 +1747,7 @@ bool AssetManager::fncScanAndMergeDirLocked(
}
mergeInfoLocked(pMergedInfo, pContents);
+ delete pContents;
return true;
}