projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da75426
)
Make sure we only parse max amount of subpackets (5) in the cook decoder.
author
Benjamin Larsson
<banan@ludd.ltu.se>
Sat, 25 Apr 2009 17:46:27 +0000
(17:46 +0000)
committer
Benjamin Larsson
<banan@ludd.ltu.se>
Sat, 25 Apr 2009 17:46:27 +0000
(17:46 +0000)
Originally committed as revision 18689 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/cook.c
patch
|
blob
|
history
diff --git
a/libavcodec/cook.c
b/libavcodec/cook.c
index
8a909df
..
99d1bdb
100644
(file)
--- a/
libavcodec/cook.c
+++ b/
libavcodec/cook.c
@@
-1219,6
+1219,10
@@
static av_cold int cook_decode_init(AVCodecContext *avctx)
q->num_subpackets++;
s++;
+ if (s > MAX_SUBPACKETS) {
+ av_log(avctx,AV_LOG_ERROR,"Too many subpackets > 5, report file!\n");
+ return -1;
+ }
}
/* Generate tables */
init_pow2table();