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:
9859f54
)
avcodec/flac: Check bps in ff_flac_parse_streaminfo()
author
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 3 Dec 2016 22:37:27 +0000
(23:37 +0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 3 Dec 2016 22:37:27 +0000
(23:37 +0100)
libavcodec/flac.c
patch
|
blob
|
history
diff --git
a/libavcodec/flac.c
b/libavcodec/flac.c
index
f5154b9
..
069cde4
100644
(file)
--- a/
libavcodec/flac.c
+++ b/
libavcodec/flac.c
@@
-222,6
+222,11
@@
void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
s->channels = get_bits(&gb, 3) + 1;
s->bps = get_bits(&gb, 5) + 1;
+ if (s->bps < 4) {
+ av_log(avctx, AV_LOG_ERROR, "invalid bps: %d\n", s->bps);
+ s->bps = 16;
+ }
+
avctx->channels = s->channels;
avctx->sample_rate = s->samplerate;
avctx->bits_per_raw_sample = s->bps;