highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '58b68e4fdea22e22178e237bda950b09cc6f363a'

Browse Source 
* commit '58b68e4fdea22e22178e237bda950b09cc6f363a':
  proresenc: Report buffer overflow

Conflicts:
	libavcodec/proresenc_kostya.c

See: 52b81ff463
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-18 20:11:31 +02:00
parent 43b769b0c4 58b68e4fde
commit e8a2f8cc12
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/proresenc_kostya.c
View File

@@ -570,9 +570,9 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic,
} }
total_size += sizes[i]; total_size += sizes[i];
if (put_bits_left(pb) < 0) { if (put_bits_left(pb) < 0) {
av_log(avctx, AV_LOG_ERROR, "Serious underevaluation of" av_log(avctx, AV_LOG_ERROR,
"required buffer size"); "Underestimated required buffer size.\n");
return AVERROR_BUFFER_TOO_SMALL; return AVERROR_BUG;
} }
} }
return total_size; return total_size;
@@ -1023,7 +1023,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
slice_hdr = buf; slice_hdr = buf;
buf += slice_hdr_size - 1; buf += slice_hdr_size - 1;
init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)) * 8); init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)) * 8);
ret = encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice); ret = encode_slice(avctx, pic, &pb, sizes, x, y, q,
mbs_per_slice);
if (ret < 0) if (ret < 0)
return ret; return ret;