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

png: improve signature check

Browse Source 
Return proper error code, print an error message and add missing
parentheses.
This commit is contained in:
Vittorio Giovara
2015-01-12 23:55:45 +01:00
parent 456ffec35d
commit 1e76345432
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/pngdec.c
View File

@@ -415,9 +415,10 @@ static int decode_frame(AVCodecContext *avctx,
/* check signature */ /* check signature */
if (buf_size < 8 || if (buf_size < 8 ||
memcmp(buf, ff_pngsig, 8) != 0 && (memcmp(buf, ff_pngsig, 8) != 0 && memcmp(buf, ff_mngsig, 8) != 0)) {
memcmp(buf, ff_mngsig, 8) != 0) av_log(avctx, AV_LOG_ERROR, "Invalid PNG signature (%d).\n", buf_size);
return -1; return AVERROR_INVALIDDATA;
}
bytestream2_init(&s->gb, buf + 8, buf_size - 8); bytestream2_init(&s->gb, buf + 8, buf_size - 8);
s->y = s->state = 0; s->y = s->state = 0;