On 13/01/15 13:53, Vittorio Giovara wrote:
> Return proper error code, print and error message and add missing
> parenthesis.
> ---
> libavcodec/pngdec.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
> index fa7f7cc..dec5bd5 100644
> --- a/libavcodec/pngdec.c
> +++ b/libavcodec/pngdec.c
> @@ -415,9 +415,10 @@ static int decode_frame(AVCodecContext *avctx,
>
> /* check signature */
> if (buf_size < 8 ||
> - memcmp(buf, ff_pngsig, 8) != 0 &&
> - memcmp(buf, ff_mngsig, 8) != 0)
> - return -1;
> + (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);
> + return AVERROR_INVALIDDATA;
> + }
>
> bytestream2_init(&s->gb, buf + 8, buf_size - 8);
> s->y = s->state = 0;
>
Ok.
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
