virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

vp3: Don't leak buffers on errors

Browse Source 
Originally committed as revision 22358 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-03-09 00:29:16 +00:00
parent 739b5090af
commit e72d2d1221
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/vp3.c
View File

@ -1812,7 +1812,7 @@ static int vp3_decode_frame(AVCodecContext *avctx,
s->current_frame.reference = 3; s->current_frame.reference = 3;
if (avctx->get_buffer(avctx, &s->current_frame) < 0) { if (avctx->get_buffer(avctx, &s->current_frame) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; goto error;
} }
if (s->keyframe) { if (s->keyframe) {
@ -1836,8 +1836,7 @@ static int vp3_decode_frame(AVCodecContext *avctx,
} else { } else {
if (!s->golden_frame.data[0]) { if (!s->golden_frame.data[0]) {
av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n"); av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n");
avctx->release_buffer(avctx, &s->current_frame); goto error;
return -1;
} }
} }
@ -1848,23 +1847,23 @@ static int vp3_decode_frame(AVCodecContext *avctx,
if (unpack_superblocks(s, &gb)){ if (unpack_superblocks(s, &gb)){
av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n"); av_log(s->avctx, AV_LOG_ERROR, "error in unpack_superblocks\n");
return -1; goto error;
} }
if (unpack_modes(s, &gb)){ if (unpack_modes(s, &gb)){
av_log(s->avctx, AV_LOG_ERROR, "error in unpack_modes\n"); av_log(s->avctx, AV_LOG_ERROR, "error in unpack_modes\n");
return -1; goto error;
} }
if (unpack_vectors(s, &gb)){ if (unpack_vectors(s, &gb)){
av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n"); av_log(s->avctx, AV_LOG_ERROR, "error in unpack_vectors\n");
return -1; goto error;
} }
if (unpack_block_qpis(s, &gb)){ if (unpack_block_qpis(s, &gb)){
av_log(s->avctx, AV_LOG_ERROR, "error in unpack_block_qpis\n"); av_log(s->avctx, AV_LOG_ERROR, "error in unpack_block_qpis\n");
return -1; goto error;
} }
if (unpack_dct_coeffs(s, &gb)){ if (unpack_dct_coeffs(s, &gb)){
av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n"); av_log(s->avctx, AV_LOG_ERROR, "error in unpack_dct_coeffs\n");
return -1; goto error;
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -1906,6 +1905,11 @@ static int vp3_decode_frame(AVCodecContext *avctx,
s->current_frame.data[0]= NULL; /* ensure that we catch any access to this released frame */ s->current_frame.data[0]= NULL; /* ensure that we catch any access to this released frame */
return buf_size; return buf_size;
error:
if (s->current_frame.data[0])
avctx->release_buffer(avctx, &s->current_frame);
return -1;
} }
/* /*