---
libavcodec/pngdec.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 4ca919b..006cb90 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -414,9 +414,18 @@ static int decode_frame(AVCodecContext *avctx,
int ret;
/* check signature */
- if (buf_size < 8 ||
- (memcmp(buf, ff_pngsig, 8) != 0 && memcmp(buf, ff_mngsig, 8) != 0)) {
- av_log(avctx, AV_LOG_ERROR, "Invalid PNG signature (%d).\n", buf_size);
+ if (buf_size < 8) {
+ av_log(avctx, AV_LOG_ERROR, "Not enough data %d\n",
+ buf_size);
+ return AVERROR_INVALIDDATA;
+ }
+ if (memcmp(buf, ff_pngsig, 8) != 0 &&
+ memcmp(buf, ff_mngsig, 8) != 0) {
+ int i;
+ av_log(avctx, AV_LOG_ERROR, "Invalid PNG signature");
+ for (i = 0; i < 8; i++)
+ av_log(avctx, AV_LOG_ERROR, " 0x%02x", buf[0]);
+ av_log(avctx, AV_LOG_ERROR, "\n");
return AVERROR_INVALIDDATA;
}
--
1.9.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
