generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle an invalid extra mpeg2 picture header following a frame-encoded picture.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Joseph Artsimovich 2013-03-01 13:37:28 +00:00 committed by Michael Niedermayer
parent 6c7d1608dd
commit 4a6bd34637
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpeg12.c
View File

@ -2269,6 +2269,7 @@ static int decode_chunks(AVCodecContext *avctx,
const uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
int ret, input_size; int ret, input_size;
int last_code = 0; int last_code = 0;
int picture_start_code_seen = 0;
for (;;) { for (;;) {
/* find next start code */ /* find next start code */
@ -2319,6 +2320,14 @@ static int decode_chunks(AVCodecContext *avctx,
break; break;
case PICTURE_START_CODE: case PICTURE_START_CODE:
if (picture_start_code_seen && s2->picture_structure == PICT_FRAME) {
/* If it's a frame picture, there can't be more than one picture header.
Yet, it does happen and we need to handle it. */
av_log(avctx, AV_LOG_WARNING, "ignoring extra picture following a frame-picture\n");
break;
}
picture_start_code_seen = 1;
if (s2->width <= 0 || s2->height <= 0) { if (s2->width <= 0 || s2->height <= 0) {
av_log(avctx, AV_LOG_ERROR, "%dx%d is invalid\n", s2->width, s2->height); av_log(avctx, AV_LOG_ERROR, "%dx%d is invalid\n", s2->width, s2->height);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;