RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821' 

* commit '1e763454322f7fbc7799f6009bf2e11d7a3b9821':
  png: improve signature check

Conflicts:
	libavcodec/pngdec.c

See: 8a08503b78
See: 0a3589bf2f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-15 02:52:47 +01:00
parent 140dfd14fd 1e76345432
commit cd960c8a4f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/pngdec.c
View File

@ -1118,7 +1118,7 @@ static int decode_frame_png(AVCodecContext *avctx,
sig = bytestream2_get_be64(&s->gb);
if (sig != PNGSIG &&
sig != MNGSIG) {
av_log(avctx, AV_LOG_ERROR, "Missing png signature\n");
av_log(avctx, AV_LOG_ERROR, "Invalid PNG signature (%d).\n", buf_size);
return AVERROR_INVALIDDATA;
}