[FFmpeg-cvslog] avcodec/pnm_parser: Support concatenated ASCII images

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Apr  6 13:11:10 2019 +0200| [7f3d39b21f893145dcfd33abf6f6a2c994b246ec] | committer: Michael Niedermayer

avcodec/pnm_parser: Support concatenated ASCII images

Fixes: Timeout (8sec -> 0.1sec)
Fixes: 13864/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PAM_fuzzer-5737860621139968

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f3d39b21f893145dcfd33abf6f6a2c994b246ec
---

 libavcodec/pnm_parser.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c
index 9bf1fdcece..e3bfa3c490 100644
--- a/libavcodec/pnm_parser.c
+++ b/libavcodec/pnm_parser.c
@@ -60,7 +60,22 @@ retry:
         }
         next = END_NOT_FOUND;
     } else if (pnmctx.type < 4) {
+              uint8_t *bs  = pnmctx.bytestream;
+        const uint8_t *end = pnmctx.bytestream_end;
+
         next = END_NOT_FOUND;
+        while (bs < end) {
+            int c = *bs++;
+            if (c == '#')  {
+                while (c != '\n' && bs < end)
+                    c = *bs++;
+            } else if (c == 'P') {
+                next = bs - pnmctx.bytestream_start + skip - 1;
+                if (pnmctx.bytestream_start != buf + skip)
+                    next -= pc->index;
+                break;
+            }
+        }
     } else {
         next = pnmctx.bytestream - pnmctx.bytestream_start + skip
                + av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1);