From fca812565cebd229fba8be32bad14983c5252a7b Mon Sep 17 00:00:00 2001 From: Christer Fletcher Date: Tue, 18 Jun 2013 08:55:09 +0200 Subject: Set u.ext_data to null after it has been freed SEGV_MAPPER crash could happen in MetaData::typed_data::freeStorage. The faulty address could be both random pointers and deadbaad. It seems like free could be called more than once on u.ext_data. Set u.ext_data to null after it has been freed as there already is a null check before trying to free it. Change-Id: I710c49f9c231bd8852159914c0b2add58a685f0e --- media/libstagefright/MetaData.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/media/libstagefright/MetaData.cpp b/media/libstagefright/MetaData.cpp index a01ec978..ae6ae2d7 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; } } -- cgit v1.2.3