diff options
Diffstat (limited to 'libavcodec/rv30.c')
| -rw-r--r-- | libavcodec/rv30.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index f23b83d93f..6d5a6fa6d4 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -2,20 +2,20 @@ * RV30 decoder * Copyright (c) 2007 Konstantin Shishkov * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -50,8 +50,13 @@ static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceIn si->quant = get_bits(gb, 5); skip_bits1(gb); si->pts = get_bits(gb, 13); - rpr = get_bits(gb, r->rpr); + rpr = get_bits(gb, av_log2(r->max_rpr) + 1); if(rpr){ + if (rpr > r->max_rpr) { + av_log(avctx, AV_LOG_ERROR, "rpr too large\n"); + return AVERROR_INVALIDDATA; + } + if (avctx->extradata_size < rpr * 2 + 8) { av_log(avctx, AV_LOG_ERROR, "Insufficient extradata - need at least %d bytes, got %d\n", @@ -81,7 +86,7 @@ static int rv30_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t for(i = 0; i < 4; i++, dst += r->intra_types_stride - 4){ for(j = 0; j < 4; j+= 2){ unsigned code = svq3_get_ue_golomb(gb) << 1; - if(code >= 81*2){ + if (code > 80U*2U) { av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n"); return -1; } @@ -260,8 +265,12 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n"); return -1; } - r->rpr = (avctx->extradata[1] & 7) >> 1; - r->rpr = FFMIN(r->rpr + 1, 3); + + r->max_rpr = avctx->extradata[1] & 7; + if(avctx->extradata_size < 2*r->max_rpr + 8){ + av_log(avctx, AV_LOG_WARNING, "Insufficient extradata - need at least %d bytes, got %d\n", + 2*r->max_rpr + 8, avctx->extradata_size); + } r->parse_slice_header = rv30_parse_slice_header; r->decode_intra_types = rv30_decode_intra_types; |