diff options
| author | Justin Ruggles <[email protected]> | 2011-09-15 18:08:52 -0400 |
|---|---|---|
| committer | Reinhard Tartler <[email protected]> | 2012-05-28 21:21:53 +0200 |
| commit | 46d9022859d1b991735fab91c88ff8dcb6891f57 (patch) | |
| tree | 59414ec090e228a1da4f2e07c2077d16b45b7742 | |
| parent | 58b3f439cc7e900fe269a7b73c58cf57a6e0c0fb (diff) | |
shorten: check for realloc failure
(cherry picked from commit 9e5e2c2d010c05c10337e9c1ec9d0d61495e0c9c)
Signed-off-by: Reinhard Tartler <[email protected]>
(cherry picked from commit a207a2fecc6a77735ab0cf209fdba0b4dd942a86)
Signed-off-by: Reinhard Tartler <[email protected]>
| -rw-r--r-- | libavcodec/shorten.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index 22fdcff403..bf2783550f 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -114,6 +114,7 @@ static int allocate_buffers(ShortenContext *s) { int i, chan; int *coeffs; + void *tmp_ptr; for (chan=0; chan<s->channels; chan++) { if(FFMAX(1, s->nmean) >= UINT_MAX/sizeof(int32_t)){ @@ -125,9 +126,15 @@ static int allocate_buffers(ShortenContext *s) return -1; } - s->offset[chan] = av_realloc(s->offset[chan], sizeof(int32_t)*FFMAX(1, s->nmean)); + tmp_ptr = av_realloc(s->offset[chan], sizeof(int32_t)*FFMAX(1, s->nmean)); + if (!tmp_ptr) + return AVERROR(ENOMEM); + s->offset[chan] = tmp_ptr; - s->decoded[chan] = av_realloc(s->decoded[chan], sizeof(int32_t)*(s->blocksize + s->nwrap)); + tmp_ptr = av_realloc(s->decoded[chan], sizeof(int32_t)*(s->blocksize + s->nwrap)); + if (!tmp_ptr) + return AVERROR(ENOMEM); + s->decoded[chan] = tmp_ptr; for (i=0; i<s->nwrap; i++) s->decoded[chan][i] = 0; s->decoded[chan] += s->nwrap; @@ -286,8 +293,15 @@ static int shorten_decode_frame(AVCodecContext *avctx, int i, input_buf_size = 0; int16_t *samples = data; if(s->max_framesize == 0){ + void *tmp_ptr; s->max_framesize= 1024; // should hopefully be enough for the first header - s->bitstream= av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, s->max_framesize); + tmp_ptr = av_fast_realloc(s->bitstream, &s->allocated_bitstream_size, + s->max_framesize); + if (!tmp_ptr) { + av_log(avctx, AV_LOG_ERROR, "error allocating bitstream buffer\n"); + return AVERROR(ENOMEM); + } + s->bitstream = tmp_ptr; } if(1 && s->max_framesize){//FIXME truncated |