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

rawdec: fix memleak

Browse Source 
Fixes fate-lavf-flm under valgrind

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-24 04:09:04 +01:00
parent 8e944891ce
commit 8e062fd169
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/rawdec.c
View File

@ -230,12 +230,15 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
len = context->frame_size - (avctx->pix_fmt==AV_PIX_FMT_PAL8 ? AVPALETTE_SIZE : 0); len = context->frame_size - (avctx->pix_fmt==AV_PIX_FMT_PAL8 ? AVPALETTE_SIZE : 0);
if (buf_size < len) { if (buf_size < len) {
av_log(avctx, AV_LOG_ERROR, "Invalid buffer size, packet size %d < expected frame_size %d\n", buf_size, len); av_log(avctx, AV_LOG_ERROR, "Invalid buffer size, packet size %d < expected frame_size %d\n", buf_size, len);
av_buffer_unref(&frame->buf[0]);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if ((res = avpicture_fill(picture, buf, avctx->pix_fmt, if ((res = avpicture_fill(picture, buf, avctx->pix_fmt,
avctx->width, avctx->height)) < 0) avctx->width, avctx->height)) < 0) {
av_buffer_unref(&frame->buf[0]);
return res; return res;
}
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE,
@ -244,8 +247,10 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
if (pal) { if (pal) {
av_buffer_unref(&context->palette); av_buffer_unref(&context->palette);
context->palette = av_buffer_alloc(AVPALETTE_SIZE); context->palette = av_buffer_alloc(AVPALETTE_SIZE);
if (!context->palette) if (!context->palette) {
av_buffer_unref(&frame->buf[0]);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
memcpy(context->palette->data, pal, AVPALETTE_SIZE); memcpy(context->palette->data, pal, AVPALETTE_SIZE);
frame->palette_has_changed = 1; frame->palette_has_changed = 1;
} }
@ -273,8 +278,10 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) || if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->frame_size) ||
(desc->flags & PIX_FMT_PSEUDOPAL)) { (desc->flags & PIX_FMT_PSEUDOPAL)) {
frame->buf[1] = av_buffer_ref(context->palette); frame->buf[1] = av_buffer_ref(context->palette);
if (!frame->buf[1]) if (!frame->buf[1]) {
av_buffer_unref(&frame->buf[0]);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
frame->data[1] = frame->buf[1]->data; frame->data[1] = frame->buf[1]->data;
} }