OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b9b633
)
indeo3: check return values of allocate_frame_buffers()
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 15 Dec 2011 00:30:38 +0000
(
01:30
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 15 Dec 2011 00:30:38 +0000
(
01:30
+0100)
Bug Found by: Diana Elena Muscalu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo3.c
patch
|
blob
|
history
diff --git
a/libavcodec/indeo3.c
b/libavcodec/indeo3.c
index
1bb73fe
..
2c96662
100644
(file)
--- a/
libavcodec/indeo3.c
+++ b/
libavcodec/indeo3.c
@@
-884,7
+884,8
@@
static int decode_frame_headers(Indeo3DecodeContext *ctx, AVCodecContext *avctx,
ctx->height = height;
free_frame_buffers(ctx);
- allocate_frame_buffers(ctx, avctx);
+ if(allocate_frame_buffers(ctx, avctx) < 0)
+ return AVERROR_INVALIDDATA;
avcodec_set_dimensions(avctx, width, height);
}
@@
-984,9
+985,7
@@
static av_cold int decode_init(AVCodecContext *avctx)
dsputil_init(&ctx->dsp, avctx);
- allocate_frame_buffers(ctx, avctx);
-
- return 0;
+ return allocate_frame_buffers(ctx, avctx);
}