[vlc-devel] commit: avcodec: free p_sys->p_ff_pic in some error paths (Jean-Paul Saman )

git version control git at videolan.org
Mon Jun 15 14:47:31 CEST 2009


vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Wed Jun  3 23:00:36 2009 +0200| [5f455214a9bb8efdea1a628989c54cd629c8f21d] | committer: Derk-Jan Hartman 

avcodec: free p_sys->p_ff_pic in some error paths
(cherry picked from commit 8a7520b350fb4eefa1a28ed43ac9dd7aca5b16c4)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5f455214a9bb8efdea1a628989c54cd629c8f21d
---

 modules/codec/avcodec/video.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index ca5de1a..eb93e1f 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -349,6 +349,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
     p_sys->p_buffer_orig = p_sys->p_buffer = malloc( p_sys->i_buffer_orig );
     if( !p_sys->p_buffer_orig )
     {
+        av_free( p_sys->p_ff_pic );
         free( p_sys );
         return VLC_ENOMEM;
     }
@@ -399,6 +400,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
     if( ffmpeg_OpenCodec( p_dec ) < 0 )
     {
         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+        av_free( p_sys->p_ff_pic );
         free( p_sys->p_buffer_orig );
         free( p_sys );
         return VLC_EGENERIC;




More information about the vlc-devel mailing list