RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-24 08:13:37 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/ivi_common: make while get_bits loop more robust by checking bits left

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-30 14:23:30 +01:00
parent 4b12930f79
commit 489c575bd6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/ivi_common.c
View File

@ -1042,7 +1042,12 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
*/ */
if (avctx->codec_id == AV_CODEC_ID_INDEO4 && if (avctx->codec_id == AV_CODEC_ID_INDEO4 &&
ctx->frame_type == 0/*FRAMETYPE_INTRA*/) { ctx->frame_type == 0/*FRAMETYPE_INTRA*/) {
while (get_bits(&ctx->gb, 8)); // skip version string // skip version string
while (get_bits(&ctx->gb, 8)) {
if (get_bits_left(&ctx->gb) < 8)
return AVERROR_INVALIDDATA;
}
skip_bits_long(&ctx->gb, 64); // skip padding, TODO: implement correct 8-bytes alignment skip_bits_long(&ctx->gb, 64); // skip padding, TODO: implement correct 8-bytes alignment
if (get_bits_left(&ctx->gb) > 18 && show_bits(&ctx->gb, 18) == 0x3FFF8) if (get_bits_left(&ctx->gb) > 18 && show_bits(&ctx->gb, 18) == 0x3FFF8)
av_log(avctx, AV_LOG_ERROR, "Buffer contains IP frames!\n"); av_log(avctx, AV_LOG_ERROR, "Buffer contains IP frames!\n");