X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fqdrw.c;h=78ceca69ac6f67d13a832e91a25e1cf644ae1e56;hb=033a86f9bb6fd59ca71d4951b8e2e27cdc1b29d9;hp=f0c0350c23afedf6468f5ed20b44d9ccf27e42ca;hpb=45fc24a005c170b3fea1c028a49fdb6be61875bd;p=ffmpeg diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index f0c0350c23a..78ceca69ac6 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -2,71 +2,78 @@ * QuickDraw (qdrw) codec * Copyright (c) 2004 Konstantin Shishkov * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav 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 FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file libavcodec/qdrw.c + * @file * Apple QuickDraw codec. */ +#include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "internal.h" -typedef struct QdrawContext{ +typedef struct QdrawContext { AVCodecContext *avctx; AVFrame pic; } QdrawContext; static int decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; + const uint8_t *buf = avpkt->data; + const uint8_t *buf_end = avpkt->data + avpkt->size; + int buf_size = avpkt->size; QdrawContext * const a = avctx->priv_data; - AVFrame * const p= (AVFrame*)&a->pic; + AVFrame * const p = &a->pic; uint8_t* outdata; int colors; - int i; + int i, ret; uint32_t *pal; int r, g, b; - if(p->data[0]) + if (p->data[0]) avctx->release_buffer(avctx, p); - p->reference= 0; - if(avctx->get_buffer(avctx, p) < 0){ + p->reference = 0; + if ((ret = ff_get_buffer(avctx, p)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } - p->pict_type= FF_I_TYPE; - p->key_frame= 1; + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; outdata = a->pic.data[0]; - buf += 0x68; /* jump to palette */ + if (buf_end - buf < 0x68 + 4) + return AVERROR_INVALIDDATA; + buf += 0x68; /* jump to palette */ colors = AV_RB32(buf); - buf += 4; + buf += 4; - if(colors < 0 || colors > 256) { + if (colors < 0 || colors > 256) { av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors); - return -1; + return AVERROR_INVALIDDATA; } + if (buf_end - buf < (colors + 1) * 8) + return AVERROR_INVALIDDATA; pal = (uint32_t*)p->data[1]; for (i = 0; i <= colors; i++) { @@ -89,6 +96,8 @@ static int decode_frame(AVCodecContext *avctx, } p->palette_has_changed = 1; + if (buf_end - buf < 18) + return AVERROR_INVALIDDATA; buf += 18; /* skip unneeded data */ for (i = 0; i < avctx->height; i++) { int size, left, code, pix; @@ -97,9 +106,12 @@ static int decode_frame(AVCodecContext *avctx, int tsize = 0; /* decode line */ - out = outdata; + out = outdata; size = AV_RB16(buf); /* size of packed line */ buf += 2; + if (buf_end - buf < size) + return AVERROR_INVALIDDATA; + left = size; next = buf + size; while (left > 0) { @@ -109,16 +121,18 @@ static int decode_frame(AVCodecContext *avctx, if ((out + (257 - code)) > (outdata + a->pic.linesize[0])) break; memset(out, pix, 257 - code); - out += 257 - code; + out += 257 - code; tsize += 257 - code; - left -= 2; + left -= 2; } else { /* copy */ if ((out + code) > (outdata + a->pic.linesize[0])) break; + if (buf_end - buf < code + 1) + return AVERROR_INVALIDDATA; memcpy(out, buf, code + 1); - out += code + 1; - buf += code + 1; - left -= 2 + code; + out += code + 1; + buf += code + 1; + left -= 2 + code; tsize += code + 1; } } @@ -126,21 +140,21 @@ static int decode_frame(AVCodecContext *avctx, outdata += a->pic.linesize[0]; } - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = a->pic; return buf_size; } -static av_cold int decode_init(AVCodecContext *avctx){ -// QdrawContext * const a = avctx->priv_data; - - avctx->pix_fmt= PIX_FMT_PAL8; +static av_cold int decode_init(AVCodecContext *avctx) +{ + avctx->pix_fmt= AV_PIX_FMT_PAL8; return 0; } -static av_cold int decode_end(AVCodecContext *avctx){ +static av_cold int decode_end(AVCodecContext *avctx) +{ QdrawContext * const a = avctx->priv_data; AVFrame *pic = &a->pic; @@ -150,15 +164,14 @@ static av_cold int decode_end(AVCodecContext *avctx){ return 0; } -AVCodec qdraw_decoder = { - "qdraw", - CODEC_TYPE_VIDEO, - CODEC_ID_QDRAW, - sizeof(QdrawContext), - decode_init, - NULL, - decode_end, - decode_frame, - CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), +AVCodec ff_qdraw_decoder = { + .name = "qdraw", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_QDRAW, + .priv_data_size = sizeof(QdrawContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), };