diff options
| author | Romain Guy <romainguy@google.com> | 2013-05-07 21:53:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-07 21:53:39 +0000 |
| commit | b8985b794211d676dfc7a2bb379f8cf843bd7d59 (patch) | |
| tree | 3786f91cdf2db232223e596f6e53da94834026e7 | |
| parent | b95c001f7db6462eb091821100b290b657eefec0 (diff) | |
| parent | d5207b2eb9ba520da822d61ff78b539842fc5255 (diff) | |
| download | frameworks_base-b8985b794211d676dfc7a2bb379f8cf843bd7d59.zip frameworks_base-b8985b794211d676dfc7a2bb379f8cf843bd7d59.tar.gz frameworks_base-b8985b794211d676dfc7a2bb379f8cf843bd7d59.tar.bz2 | |
Merge "Fix double-free in AssetAtlas Bug #8833153"
| -rw-r--r-- | libs/hwui/AssetAtlas.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/hwui/AssetAtlas.cpp b/libs/hwui/AssetAtlas.cpp index d8c9071..4d2fc01 100644 --- a/libs/hwui/AssetAtlas.cpp +++ b/libs/hwui/AssetAtlas.cpp @@ -39,13 +39,17 @@ void AssetAtlas::init(sp<GraphicBuffer> buffer, int* map, int count) { createEntries(map, count); } else { + ALOGW("Could not create atlas image"); + delete mImage; + mImage = NULL; } } void AssetAtlas::terminate() { if (mImage) { delete mImage; + mImage = NULL; for (size_t i = 0; i < mEntries.size(); i++) { delete mEntries.valueAt(i); |