# HG changeset patch # User kostya # Date 1261242270 0 # Node ID 96a836b623ba258df48ff8dbdb77bb450101e136 # Parent 633727ffa79af269065533ba63fb4f3530e303b8 Improve handling allocated buffers in Xan decoder diff -r 633727ffa79a -r 96a836b623ba xan.c --- a/xan.c Sat Dec 19 16:39:21 2009 +0000 +++ b/xan.c Sat Dec 19 17:04:30 2009 +0000 @@ -76,10 +76,14 @@ s->buffer1_size = avctx->width * avctx->height; s->buffer1 = av_malloc(s->buffer1_size); + if (!s->buffer1) + return -1; s->buffer2_size = avctx->width * avctx->height; s->buffer2 = av_malloc(s->buffer2_size + 130); - if (!s->buffer1 || !s->buffer2) + if (!s->buffer2) { + av_freep(&s->buffer1); return -1; + } return 0; } @@ -405,8 +409,8 @@ if (s->current_frame.data[0]) avctx->release_buffer(avctx, &s->current_frame); - av_free(s->buffer1); - av_free(s->buffer2); + av_freep(&s->buffer1); + av_freep(&s->buffer2); return 0; }