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:
c72fa43
)
avcodec/flacdec: Fix undefined shift in decode_subframe()
author
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 3 Dec 2016 23:11:17 +0000
(
00:11
+0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 3 Dec 2016 23:12:06 +0000
(
00:12
+0100)
Fixes undefined behavior
Fixes: 639961-media
Found-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/flacdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/flacdec.c
b/libavcodec/flacdec.c
index
d1beb4e
..
af81115
100644
(file)
--- a/
libavcodec/flacdec.c
+++ b/
libavcodec/flacdec.c
@@
-452,7
+452,7
@@
static inline int decode_subframe(FLACContext *s, int channel)
if (wasted) {
int i;
for (i = 0; i < s->blocksize; i++)
- decoded[i]
<<=
wasted;
+ decoded[i]
= (unsigned)decoded[i] <<
wasted;
}
return 0;