aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pnmdec.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-09 01:09:35 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2016-11-12 01:36:47 +0100
commitcdb5479c9ddc886f0b8661db585405ebab343e80 (patch)
tree62061b31abfdac1ecd66b5655877bcf4777b7a2b /libavcodec/pnmdec.c
parent484151df7c8f4fb45229b9b3a585efd3faa62501 (diff)
downloadffmpeg-cdb5479c9ddc886f0b8661db585405ebab343e80.tar.gz
pnmdec: make sure v is capped by maxval
Otherwise put_bits can be called with a value that doesn't fit in the sample_len, causing an assertion failure. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/pnmdec.c')
-rw-r--r--libavcodec/pnmdec.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
index ca97cc38c3..958c5e43b0 100644
--- a/libavcodec/pnmdec.c
+++ b/libavcodec/pnmdec.c
@@ -43,7 +43,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
int buf_size = avpkt->size;
PNMContext * const s = avctx->priv_data;
AVFrame * const p = data;
- int i, j, n, linesize, h, upgrade = 0, is_mono = 0;
+ int i, j, k, n, linesize, h, upgrade = 0, is_mono = 0;
unsigned char *ptr;
int components, sample_len, ret;
@@ -143,10 +143,14 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
v = (*s->bytestream++)&1;
} else {
/* read a sequence of digits */
- do {
+ for (k = 0; k < 5 && c <= 9; k += 1) {
v = 10*v + c;
c = (*s->bytestream++) - '0';
- } while (c <= 9);
+ }
+ if (v > s->maxval) {
+ av_log(avctx, AV_LOG_ERROR, "value %d larger than maxval %d\n", v, s->maxval);
+ return AVERROR_INVALIDDATA;
+ }
}
if (sample_len == 16) {
((uint16_t*)ptr)[j] = (((1<<sample_len)-1)*v + (s->maxval>>1))/s->maxval;