diff options
author | Andreas Huber <andih@google.com> | 2013-06-28 15:29:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-28 15:29:01 -0700 |
commit | 47a1fe04637793f48d808261b1fac47acc3de1e1 (patch) | |
tree | d29e650d5b2a1c0db68681362bb4faa86589a92f | |
parent | 83790fcce4f5cda1e7c89f1cbed452426502f227 (diff) | |
parent | a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507 (diff) | |
download | frameworks_av-47a1fe04637793f48d808261b1fac47acc3de1e1.zip frameworks_av-47a1fe04637793f48d808261b1fac47acc3de1e1.tar.gz frameworks_av-47a1fe04637793f48d808261b1fac47acc3de1e1.tar.bz2 |
am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit 'a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507':
Set u.ext_data to null after it has been freed
-rw-r--r-- | media/libstagefright/MetaData.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/MetaData.cpp b/media/libstagefright/MetaData.cpp index a01ec97..ae6ae2d 100644 --- a/media/libstagefright/MetaData.cpp +++ b/media/libstagefright/MetaData.cpp @@ -282,6 +282,7 @@ void MetaData::typed_data::freeStorage() { if (!usesReservoir()) { if (u.ext_data) { free(u.ext_data); + u.ext_data = NULL; } } |