diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 13:15:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 13:15:59 +0100 |
| commit | 663ebae79a3e556d8be5004057f805dd82e21062 (patch) | |
| tree | 6ac81137a69515c7b4180deeea159b6116f7235c | |
| parent | ea2de3d09614fcfe53b9406cce57a1bf8cf6d5cd (diff) | |
| parent | 56daf10e0313c5e36f43e773f457d2a99ff0df10 (diff) | |
Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10'
* commit '56daf10e0313c5e36f43e773f457d2a99ff0df10':
mov: use the format context for logging.
flicvideo: avoid an infinite loop in byte run compression
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/flicvideo.c | 5 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 9e35f48e4c..2f8cd33802 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -387,6 +387,11 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, if (bytestream2_tell(&g2) + 1 > stream_ptr_after_chunk) break; byte_run = sign_extend(bytestream2_get_byte(&g2), 8); + if (!byte_run) { + av_log(avctx, AV_LOG_ERROR, "Invalid byte run value.\n"); + return AVERROR_INVALIDDATA; + } + if (byte_run > 0) { palette_idx1 = bytestream2_get_byte(&g2); CHECK_PIXEL_PTR(byte_run); diff --git a/libavformat/mov.c b/libavformat/mov.c index 86ec95c1e5..137f79b331 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -835,7 +835,7 @@ static int mov_read_mdhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) version = avio_r8(pb); if (version > 1) { - av_log_ask_for_sample(c, "unsupported version %d\n", version); + av_log_ask_for_sample(c->fc, "unsupported version %d\n", version); return AVERROR_PATCHWELCOME; } avio_rb24(pb); /* flags */ |