diff options
| author | Basavapatna Dattaguru <dattaguru@google.com> | 2011-02-21 19:39:09 -0800 |
|---|---|---|
| committer | Basavapatna Dattaguru <dattaguru@google.com> | 2011-02-21 20:23:38 -0800 |
| commit | 63754a7bdb7b8ed1071a7c67766ab1f5e381728d (patch) | |
| tree | 8b58730c7dfd434cee342600c15c90437fe4da24 | |
| parent | 7e006bd24cccffb9c9fd48fd3b2709b6639bc5f1 (diff) | |
| download | frameworks_av-63754a7bdb7b8ed1071a7c67766ab1f5e381728d.zip frameworks_av-63754a7bdb7b8ed1071a7c67766ab1f5e381728d.tar.gz frameworks_av-63754a7bdb7b8ed1071a7c67766ab1f5e381728d.tar.bz2 | |
VideoEditor:Issue:3431967: Memory leak in Export case
Code cleanup
Change-Id: I81be8ef4f3abead6a85db8b0a4b2a9c594b1bcac
| -rwxr-xr-x | libvideoeditor/vss/src/M4xVSS_internal.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/libvideoeditor/vss/src/M4xVSS_internal.c b/libvideoeditor/vss/src/M4xVSS_internal.c index b56d524..192e1ba 100755 --- a/libvideoeditor/vss/src/M4xVSS_internal.c +++ b/libvideoeditor/vss/src/M4xVSS_internal.c @@ -2417,7 +2417,6 @@ M4OSA_ERR M4xVSS_internalConvertARGB888toYUV420_FrammingEffect(M4OSA_Context pCo { M4OSA_TRACE1_1("SPS png: error when converting from RGB to YUV: 0x%x\n", err); } - M4OSA_TRACE3_0("M4xVSS_internalConvertARGB888toYUV420_FrammingEffect: Leaving "); return err; } @@ -3271,7 +3270,6 @@ M4OSA_ERR M4xVSS_freeSettings(M4VSS3GPP_EditSettings* pSettings) { if(framingCtx->aFramingCtx != M4OSA_NULL) { - if(pSettings->Effects[i].xVSS.pFramingBuffer == M4OSA_NULL) { if(framingCtx->aFramingCtx->FramingRgb != M4OSA_NULL) { @@ -3301,17 +3299,14 @@ M4OSA_ERR M4xVSS_freeSettings(M4VSS3GPP_EditSettings* pSettings) } if(framingCtx->aFramingCtx_last != M4OSA_NULL) { - if(pSettings->Effects[i].xVSS.pFramingBuffer == M4OSA_NULL) + if(framingCtx->aFramingCtx_last->FramingRgb != M4OSA_NULL) { - if(framingCtx->aFramingCtx_last->FramingRgb != M4OSA_NULL) - { - M4OSA_free((M4OSA_MemAddr32)framingCtx->aFramingCtx_last->\ - FramingRgb->pac_data); - framingCtx->aFramingCtx_last->FramingRgb->pac_data = M4OSA_NULL; - M4OSA_free((M4OSA_MemAddr32)framingCtx->aFramingCtx_last->\ - FramingRgb); - framingCtx->aFramingCtx_last->FramingRgb = M4OSA_NULL; - } + M4OSA_free((M4OSA_MemAddr32)framingCtx->aFramingCtx_last->\ + FramingRgb->pac_data); + framingCtx->aFramingCtx_last->FramingRgb->pac_data = M4OSA_NULL; + M4OSA_free((M4OSA_MemAddr32)framingCtx->aFramingCtx_last->\ + FramingRgb); + framingCtx->aFramingCtx_last->FramingRgb = M4OSA_NULL; } if(framingCtx->aFramingCtx_last->FramingYuv != M4OSA_NULL) { @@ -3358,15 +3353,12 @@ M4OSA_ERR M4xVSS_freeSettings(M4VSS3GPP_EditSettings* pSettings) if(framingCtx != M4OSA_NULL) /* Bugfix 1.2.0: crash, trying to free non existant pointer */ { - if(pSettings->Effects[i].xVSS.pFramingBuffer == M4OSA_NULL) + if(framingCtx->FramingRgb != M4OSA_NULL) { - if(framingCtx->FramingRgb != M4OSA_NULL) - { - M4OSA_free((M4OSA_MemAddr32)framingCtx->FramingRgb->pac_data); - framingCtx->FramingRgb->pac_data = M4OSA_NULL; - M4OSA_free((M4OSA_MemAddr32)framingCtx->FramingRgb); - framingCtx->FramingRgb = M4OSA_NULL; - } + M4OSA_free((M4OSA_MemAddr32)framingCtx->FramingRgb->pac_data); + framingCtx->FramingRgb->pac_data = M4OSA_NULL; + M4OSA_free((M4OSA_MemAddr32)framingCtx->FramingRgb); + framingCtx->FramingRgb = M4OSA_NULL; } if(framingCtx->FramingYuv != M4OSA_NULL) { |