avcodec: Constify all the AVCodecParsers

[ffmpeg] / libavcodec / pnm_parser.c

diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c
index f3be6d640cd5b1f9186895f3d955421793d47b9a..f8eb2e7edab2dc4146c2a2be04b36ff7d79aac9b 100644 (file)
--- a/libavcodec/pnm_parser.c
+++ b/libavcodec/pnm_parser.c
@@ -111,7 +111,7 @@ retry:
     } else {
         int ret = av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1);
         next = pnmctx.bytestream - pnmctx.bytestream_start + skip;
-        if (ret >= 0)
+        if (ret >= 0 && next + (uint64_t)ret <= INT_MAX)
             next += ret;
     }
     if (next != END_NOT_FOUND && pnmctx.bytestream_start != buf + skip)
@@ -131,7 +131,7 @@ end:
     return next;
 }
 
-AVCodecParser ff_pnm_parser = {
+const AVCodecParser ff_pnm_parser = {
     .codec_ids      = { AV_CODEC_ID_PGM, AV_CODEC_ID_PGMYUV, AV_CODEC_ID_PPM,
                         AV_CODEC_ID_PBM, AV_CODEC_ID_PAM },
     .priv_data_size = sizeof(PNMParseContext),