diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-24 15:39:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-24 15:39:41 +0100 |
| commit | 2bf09826c170b0f474f1cd92a138acd8109eef8b (patch) | |
| tree | a0bddb5be4acd8f297c7d632517f60942f67e184 | |
| parent | 58030fc6c802d8cc45f114402ccb27be8c06f76b (diff) | |
loco: Fix error handling.
Fixes null pointer dereference / http://www.google-melange.com/gci/task/view/google/gci2011/7120335
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/loco.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/loco.c b/libavcodec/loco.c index 505f566ba6..75701e970b 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -123,6 +123,9 @@ static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int heigh int val; int i, j; + if(buf_size<=0) + return -1; + init_get_bits(&rc.gb, buf, buf_size*8); rc.save = 0; rc.run = 0; @@ -225,7 +228,7 @@ static int decode_frame(AVCodecContext *avctx, *data_size = sizeof(AVFrame); *(AVFrame*)data = l->pic; - return buf_size; + return buf_size < 0 ? -1 : buf_size; } static av_cold int decode_init(AVCodecContext *avctx){ |