Commit cd960c8a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1e763454'

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

Conflicts:
	libavcodec/pngdec.c

See: 8a08503b
See: 0a3589bfMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 140dfd14 1e763454
...@@ -1118,7 +1118,7 @@ static int decode_frame_png(AVCodecContext *avctx, ...@@ -1118,7 +1118,7 @@ static int decode_frame_png(AVCodecContext *avctx,
sig = bytestream2_get_be64(&s->gb); sig = bytestream2_get_be64(&s->gb);
if (sig != PNGSIG && if (sig != PNGSIG &&
sig != MNGSIG) { 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; return AVERROR_INVALIDDATA;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment