[FFmpeg-devel] [PATCH] h264/aac in flv

[Baptiste Coudurier]

Michael Niedermayer wrote:
> On Mon, May 05, 2008 at 03:54:29PM +0200, Baptiste Coudurier wrote:
>> Hi guys,
>>
>> $subject, 2 patches, I'll commit pts/dts renaming seperately.
>>
>> Specs: http://www.adobe.com/devnet/flv/
> [...]
>> +static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size)
>> +{
>> +    av_free(st->codec->extradata);
>> +    st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE);
> 
> I think the addition can overflow

Humm, size is on 24bit (get_be24). Can it still overflow ?

> [...]
> 
>> +            if (type == 0) {
>> +                if ((ret = flv_get_extradata(s, st, size - 1)) < 0)
>> +                    return ret;
>> +                goto retry;
>> +            }
>> +        }
>>      }else{
>>          size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK);
>> +        if (st->codec->codec_id == CODEC_ID_H264) {
>> +            int type = get_byte(s->pb);
>> +            pkt->pts = dts + get_be24(s->pb);
> 
>> +            if (type == 0) {
>> +                if ((ret = flv_get_extradata(s, st, size - 1)) < 0)
>> +                    return ret;
>> +                goto retry;
>> +            }
> 
> code duplication

Patch updated.

-- 
Baptiste COUDURIER                              GnuPG Key Id: 0x5C1ABAAA
Smartjog USA Inc.                                http://www.smartjog.com
Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
-------------- next part --------------
A non-text attachment was scrubbed...
Name: h264_aac_flv_demux.patch
Type: text/x-diff
Size: 4187 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080505/571592a7/attachment.patch>