diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-09 20:58:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-09 21:06:01 +0100 |
| commit | 2fbb37b51bbea891392ad357baf8f3dff00bac05 (patch) | |
| tree | 9f78112e1de2912e0500f332df1c651da0089d8a /libavcodec | |
| parent | b8551f8ea71b7d6ae39de121213860262d911001 (diff) | |
| download | ffmpeg-2fbb37b51bbea891392ad357baf8f3dff00bac05.tar.gz | |
iff/ilbm: check remaining buffer size.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/iff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index d5c1457de1..9184015d50 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -575,13 +575,13 @@ static int decode_frame_ilbm(AVCodecContext *avctx, } } else if (avctx->codec_tag == MKTAG('P','B','M',' ')) { // IFF-PBM if (avctx->pix_fmt == AV_PIX_FMT_PAL8 || avctx->pix_fmt == AV_PIX_FMT_GRAY8) { - for(y = 0; y < avctx->height; y++ ) { + for(y = 0; y < avctx->height && buf_end > buf; y++ ) { uint8_t *row = &s->frame.data[0][y * s->frame.linesize[0]]; memcpy(row, buf, FFMIN(avctx->width, buf_end - buf)); buf += avctx->width + (avctx->width % 2); // padding if odd } } else if (s->ham) { // IFF-PBM: HAM to AV_PIX_FMT_BGR32 - for (y = 0; y < avctx->height; y++) { + for (y = 0; y < avctx->height && buf_end > buf; y++) { uint8_t *row = &s->frame.data[0][ y*s->frame.linesize[0] ]; memcpy(s->ham_buf, buf, FFMIN(avctx->width, buf_end - buf)); buf += avctx->width + (avctx->width & 1); // padding if odd |