diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-27 17:54:22 +0200 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2016-06-29 11:00:34 +0200 |
| commit | 25f0ea9ece79ddd11f333acde38849e8c46543f5 (patch) | |
| tree | 39dfb99e3b8a81f93ba164fe836a32b7f43ef567 /libavcodec | |
| parent | 36fcb8cc559aa0d8639a01872c82b906f3847572 (diff) | |
| download | ffmpeg-25f0ea9ece79ddd11f333acde38849e8c46543f5.tar.gz | |
lavc/pnm_parser: disable parsing for text based PNMs
P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM
files.
We can not obtain the buffer size using av_imgage_get_buffer_size() as
every pixel in the picture will occupy a random size between 16 and 32
bits ("4 " and "231 " are such example).
Ideally, we could look for the next header (or EOF) in the bytestream,
but this commit is meant to fix a decoding regression introduced by
48ac4532d437790e56b8ed5d0d467dc88685f035.
Fix Ticket #5670
(cherry picked from commit c5566f0a944e376b39c8f994659060ca036c441d)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pnm_parser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index a7d70b9931..43dbfc7f27 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -66,6 +66,8 @@ retry: } #endif next = END_NOT_FOUND; + } else if (pnmctx.type < 4) { + next = END_NOT_FOUND; } else { next = pnmctx.bytestream - pnmctx.bytestream_start + av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); |