[FFmpeg-devel] [PATCH] avcodec/alsdec: implement floating point decoding

Umair Khan omerjerk at gmail.com
Wed Jul 27 20:25:49 EEST 2016


On Wed, Jul 27, 2016 at 1:27 PM, Umair Khan <omerjerk at gmail.com> wrote:
> On Wed, Jul 27, 2016 at 1:28 PM, Thilo Borgmann <thilo.borgmann at mail.de> wrote:
>> Hi,
>>
>>>> [...]
>>>>> @@ -1678,6 +1931,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
>>>>>  {
>>>>>      unsigned int c;
>>>>>      unsigned int channel_size;
>>>>> +    unsigned int i;
>>>>>      int num_buffers, ret;
>>>>>      ALSDecContext *ctx = avctx->priv_data;
>>>>>      ALSSpecificConfig *sconf = &ctx->sconf;
>>>>> @@ -1803,6 +2057,34 @@ static av_cold int decode_init(AVCodecContext *avctx)
>>>>>      ctx->raw_buffer       = av_mallocz_array(avctx->channels * channel_size, sizeof(*ctx->raw_buffer));
>>>>>      ctx->raw_samples      = av_malloc_array(avctx->channels, sizeof(*ctx->raw_samples));
>>>>>
>>>>> +    if (sconf->floating) {
>>>>> +        ctx->acf               = av_malloc_array(avctx->channels, sizeof(*ctx->acf));
>>>>> +        ctx->shift_value       = av_malloc_array(avctx->channels, sizeof(*ctx->shift_value));
>>>>> +        ctx->last_shift_value  = av_malloc_array(avctx->channels, sizeof(*ctx->last_shift_value));
>>>>> +        ctx->last_acf_mantissa = av_malloc_array(avctx->channels, sizeof(*ctx->last_acf_mantissa));
>>>>> +        ctx->raw_mantissa      = av_malloc_array(avctx->channels, sizeof(*ctx->raw_mantissa));
>>>>> +
>>>>> +        for (c = 0; c < avctx->channels; ++c) {
>>>>> +            ctx->raw_mantissa[c] = av_malloc_array(ctx->cur_frame_length, sizeof(**ctx->raw_mantissa));
>>>>
>>>> using ctx->raw_mantissa without prior malloc failure check
>>>
>>> Should I keep this in a separate patch? It is unrelated to my patch.
>>
>> This is not unrelated to your patch. You're allocating ctx->raw_mantissa array
>> and use the (maybe invalid) "allocated" array in the for loop. Test for a valid
>> pointer in ctx->raw_matissa before using it.
>
> Oops. Sorry. I mistook it as raw_samples. I'll send another patch in a bit.

Updated patch attached.

-Umair
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-avcodec-alsdec-implement-floating-point-decoding.patch
Type: application/octet-stream
Size: 28188 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160727/61a5be46/attachment.obj>


More information about the ffmpeg-devel mailing list