Skip to content
Snippets Groups Projects
Commit 18bcfc91 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

shorten: Fix invalid free()

parent 1795fed7
No related branches found
No related tags found
No related merge requests found
...@@ -86,6 +86,7 @@ typedef struct ShortenContext { ...@@ -86,6 +86,7 @@ typedef struct ShortenContext {
int channels; int channels;
int32_t *decoded[MAX_CHANNELS]; int32_t *decoded[MAX_CHANNELS];
int32_t *decoded_base[MAX_CHANNELS];
int32_t *offset[MAX_CHANNELS]; int32_t *offset[MAX_CHANNELS];
int *coeffs; int *coeffs;
uint8_t *bitstream; uint8_t *bitstream;
...@@ -140,13 +141,13 @@ static int allocate_buffers(ShortenContext *s) ...@@ -140,13 +141,13 @@ static int allocate_buffers(ShortenContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->offset[chan] = tmp_ptr; s->offset[chan] = tmp_ptr;
tmp_ptr = av_realloc(s->decoded[chan], sizeof(int32_t)*(s->blocksize + s->nwrap)); tmp_ptr = av_realloc(s->decoded_base[chan], sizeof(int32_t)*(s->blocksize + s->nwrap));
if (!tmp_ptr) if (!tmp_ptr)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->decoded[chan] = tmp_ptr; s->decoded_base[chan] = tmp_ptr;
for (i=0; i<s->nwrap; i++) for (i=0; i<s->nwrap; i++)
s->decoded[chan][i] = 0; s->decoded_base[chan][i] = 0;
s->decoded[chan] += s->nwrap; s->decoded[chan] = s->decoded_base[chan] + s->nwrap;
} }
coeffs = av_realloc(s->coeffs, s->nwrap * sizeof(*s->coeffs)); coeffs = av_realloc(s->coeffs, s->nwrap * sizeof(*s->coeffs));
...@@ -615,8 +616,8 @@ static av_cold int shorten_decode_close(AVCodecContext *avctx) ...@@ -615,8 +616,8 @@ static av_cold int shorten_decode_close(AVCodecContext *avctx)
int i; int i;
for (i = 0; i < s->channels; i++) { for (i = 0; i < s->channels; i++) {
s->decoded[i] -= s->nwrap; s->decoded[i] = NULL;
av_freep(&s->decoded[i]); av_freep(&s->decoded_base[i]);
av_freep(&s->offset[i]); av_freep(&s->offset[i]);
} }
av_freep(&s->bitstream); av_freep(&s->bitstream);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment