From 7c8f25f5b81ed2c6520174ead6d0fdf96a313945 Mon Sep 17 00:00:00 2001 From: Santosh Madhava Date: Sun, 27 Feb 2011 20:27:20 -0800 Subject: [PATCH] Fix for issue 3431967: Memory leak from video editor engine Change-Id: I610e82f5bdb8ac7b32541301a9fa41bbd8f1459d --- media/jni/mediaeditor/VideoEditorMain.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/media/jni/mediaeditor/VideoEditorMain.cpp b/media/jni/mediaeditor/VideoEditorMain.cpp index 23081f868fcba..9fe026661b332 100755 --- a/media/jni/mediaeditor/VideoEditorMain.cpp +++ b/media/jni/mediaeditor/VideoEditorMain.cpp @@ -1707,12 +1707,19 @@ videoEditor_populateSettings( if (aFramingCtx->FramingYuv != M4OSA_NULL ) { - if (aFramingCtx->FramingYuv->pac_data != M4OSA_NULL) { - M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv->pac_data); - aFramingCtx->FramingYuv->pac_data = M4OSA_NULL; + if (aFramingCtx->FramingYuv[0].pac_data != M4OSA_NULL) { + M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[0].pac_data); + aFramingCtx->FramingYuv[0].pac_data = M4OSA_NULL; } - } - if (aFramingCtx->FramingYuv != M4OSA_NULL) { + if (aFramingCtx->FramingYuv[1].pac_data != M4OSA_NULL) { + M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[1].pac_data); + aFramingCtx->FramingYuv[1].pac_data = M4OSA_NULL; + } + if (aFramingCtx->FramingYuv[2].pac_data != M4OSA_NULL) { + M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv[2].pac_data); + aFramingCtx->FramingYuv[2].pac_data = M4OSA_NULL; + } + M4OSA_free((M4OSA_MemAddr32)aFramingCtx->FramingYuv); aFramingCtx->FramingYuv = M4OSA_NULL; }