aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-10-22 02:25:26 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-10-22 02:25:26 +0000
commit4c3267aaad9927d30dbe4ecf8b45825e2b36326f (patch)
treef6a6da3da3650583c5c2c2c2d65d740186960fc1 /libavcodec
parenta2d4dfd493020cd15489991776eb2c7c504965d4 (diff)
downloadffmpeg-4c3267aaad9927d30dbe4ecf8b45825e2b36326f.tar.gz
Fix memleak in mjpeg decoder.
Originally committed as revision 25549 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpegdec.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 2fae64f872..e57f74f374 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -194,8 +194,12 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s)
if(build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1, 0, class > 0) < 0){
return -1;
}
- if(class>0 && build_vlc(&s->vlcs[2][index], bits_table, val_table, code_max + 1, 0, 0) < 0){
+
+ if(class>0){
+ free_vlc(&s->vlcs[2][index]);
+ if(build_vlc(&s->vlcs[2][index], bits_table, val_table, code_max + 1, 0, 0) < 0){
return -1;
+ }
}
}
return 0;
@@ -1521,7 +1525,7 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx)
av_freep(&s->ljpeg_buffer);
s->ljpeg_buffer_size=0;
- for(i=0;i<2;i++) {
+ for(i=0;i<3;i++) {
for(j=0;j<4;j++)
free_vlc(&s->vlcs[i][j]);
}