summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2014-06-17 19:21:56 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-06-17 19:21:56 +0000
commit7efc0eb163e8d07963c354805b6f36010aa74106 (patch)
tree6076b9b78446b52bb0bfb970d90363af14f89bd8 /libs/androidfw/AssetManager.cpp
parent40ff293a1a1ef00d0cb751d395fd86a4d8d0aec3 (diff)
parentf5cb96cfbbd2a7148b4b337097c94bea3f52d5f3 (diff)
am f5cb96cf: am 51736de1: am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug"
* commit 'f5cb96cfbbd2a7148b4b337097c94bea3f52d5f3': [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 91dda75026ab..1b3f1fd9c573 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -1768,6 +1768,7 @@ bool AssetManager::fncScanAndMergeDirLocked(
}
mergeInfoLocked(pMergedInfo, pContents);
+ delete pContents;
return true;
}