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:
4d70023
)
aacdec: Fix null pointer crash
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Dec 2011 04:02:11 +0000
(
05:02
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Dec 2011 04:04:56 +0000
(
05:04
+0100)
Fixes bug170
Bug found by: Gautam Gupta
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4audio.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg4audio.c
b/libavcodec/mpeg4audio.c
index
6744593
..
abd3fa4
100644
(file)
--- a/
libavcodec/mpeg4audio.c
+++ b/
libavcodec/mpeg4audio.c
@@
-82,6
+82,9
@@
int avpriv_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf,
GetBitContext gb;
int specific_config_bitindex;
+ if(bit_size<=0)
+ return AVERROR_INVALIDDATA;
+
init_get_bits(&gb, buf, bit_size);
c->object_type = get_object_type(&gb);
c->sample_rate = get_sample_rate(&gb, &c->sampling_index);