[FFmpeg-cvslog] mxg: do not leak mxg->buffer

Paul B Mahol git at videolan.org
Fri Feb 22 14:42:10 CET 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Feb 22 13:37:35 2013 +0000| [a72b41035cc4925922b4164b7453c9a5c2b7e630] | committer: Paul B Mahol

mxg: do not leak mxg->buffer

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a72b41035cc4925922b4164b7453c9a5c2b7e630
---

 libavformat/mxg.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavformat/mxg.c b/libavformat/mxg.c
index d911a33..e9a6f22 100644
--- a/libavformat/mxg.c
+++ b/libavformat/mxg.c
@@ -101,17 +101,19 @@ static int mxg_update_cache(AVFormatContext *s, unsigned int cache_size)
     MXGContext *mxg = s->priv_data;
     unsigned int current_pos = mxg->buffer_ptr - mxg->buffer;
     unsigned int soi_pos;
+    uint8_t *buffer;
     int ret;
 
     /* reallocate internal buffer */
     if (current_pos > current_pos + cache_size)
         return AVERROR(ENOMEM);
     soi_pos = mxg->soi_ptr - mxg->buffer;
-    mxg->buffer = av_fast_realloc(mxg->buffer, &mxg->buffer_size,
-                                  current_pos + cache_size +
-                                  FF_INPUT_BUFFER_PADDING_SIZE);
-    if (!mxg->buffer)
+    buffer = av_fast_realloc(mxg->buffer, &mxg->buffer_size,
+                             current_pos + cache_size +
+                             FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!buffer)
         return AVERROR(ENOMEM);
+    mxg->buffer = buffer;
     mxg->buffer_ptr = mxg->buffer + current_pos;
     if (mxg->soi_ptr) mxg->soi_ptr = mxg->buffer + soi_pos;
 



More information about the ffmpeg-cvslog mailing list