git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39c5cd6
)
aasc: check before reading the first 4 byte, fix overread
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 14 Nov 2012 02:03:04 +0000
(
03:03
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 14 Nov 2012 02:03:35 +0000
(
03:03
+0100)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aasc.c
patch
|
blob
|
history
diff --git
a/libavcodec/aasc.c
b/libavcodec/aasc.c
index
a759e0d
..
6c9fd4e
100644
(file)
--- a/
libavcodec/aasc.c
+++ b/
libavcodec/aasc.c
@@
-83,6
+83,11
@@
static int aasc_decode_frame(AVCodecContext *avctx,
AascContext *s = avctx->priv_data;
int compr, i, stride, psize;
+ if (buf_size < 4) {
+ av_log(avctx, AV_LOG_ERROR, "frame too short\n");
+ return AVERROR_INVALIDDATA;
+ }
+
s->frame.reference = 3;
s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
if (avctx->reget_buffer(avctx, &s->frame)) {