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

avcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is set

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
John Stebbins
2014-06-18 13:38:36 -07:00
committed by Michael Niedermayer
parent fc7da418ff
commit 066a4819cc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pgssubdec.c
View File

@@ -150,9 +150,13 @@ static int decode_rle(AVCodecContext *avctx, AVSubtitleRect *rect,
* New Line. Check if correct pixels decoded, if not display warning * New Line. Check if correct pixels decoded, if not display warning
* and adjust bitmap pointer to correct new line position. * and adjust bitmap pointer to correct new line position.
*/ */
if (pixel_count % rect->w > 0) if (pixel_count % rect->w > 0) {
av_log(avctx, AV_LOG_ERROR, "Decoded %d pixels, when line should be %d pixels\n", av_log(avctx, AV_LOG_ERROR, "Decoded %d pixels, when line should be %d pixels\n",
pixel_count % rect->w, rect->w); pixel_count % rect->w, rect->w);
if (avctx->err_recognition & AV_EF_EXPLODE) {
return AVERROR_INVALIDDATA;
}
}
line_count++; line_count++;
} }
} }