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:
dda713f
)
jpeglsdec: Prevent out of array write.
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 13 Feb 2012 22:50:35 +0000
(23:50 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 14 Feb 2012 00:22:38 +0000
(
01:22
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeglsdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/jpeglsdec.c
b/libavcodec/jpeglsdec.c
index
0139c88
..
74714e0
100644
(file)
--- a/
libavcodec/jpeglsdec.c
+++ b/
libavcodec/jpeglsdec.c
@@
-198,6
+198,9
@@
static inline void ls_decode_line(JLSState *state, MJpegDecodeContext *s, void *
r = ff_log2_run[state->run_index[comp]];
if(r)
r = get_bits_long(&s->gb, r);
+ if(x + r * stride > w) {
+ r = (w - x) / stride;
+ }
for(i = 0; i < r; i++) {
W(dst, x, Ra);
x += stride;