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:
8b505fc
)
Do not try to decode more data than output buffer may hold
author
Kostya Shishkov
<kostya.shishkov@gmail.com>
Mon, 24 Sep 2007 03:32:24 +0000
(
03:32
+0000)
committer
Kostya Shishkov
<kostya.shishkov@gmail.com>
Mon, 24 Sep 2007 03:32:24 +0000
(
03:32
+0000)
Originally committed as revision 10560 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/adx.c
patch
|
blob
|
history
diff --git
a/libavcodec/adx.c
b/libavcodec/adx.c
index
593c19d
..
2b44b89
100644
(file)
--- a/
libavcodec/adx.c
+++ b/
libavcodec/adx.c
@@
-328,6
+328,11
@@
static int adx_decode_frame(AVCodecContext *avctx,
rest -= hdrsize;
}
+ /* 18 bytes of data are expanded into 32*2 bytes of audio,
+ so guard against buffer overflows */
+ if(rest/18 > *data_size/64)
+ rest = (*data_size/64) * 18;
+
if (c->in_temp) {
int copysize = 18*avctx->channels - c->in_temp;
memcpy(c->dec_temp+c->in_temp,buf,copysize);