projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ed2e97c
)
avcodec/sgidec: fix linesize for 16bit
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 27 Oct 2014 19:48:58 +0000
(20:48 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 27 Oct 2014 19:49:47 +0000
(20:49 +0100)
Fixes: asan_heap-oob_22b30d4_39_038.sgi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sgidec.c
patch
|
blob
|
history
diff --git
a/libavcodec/sgidec.c
b/libavcodec/sgidec.c
index
6f51ec3
..
8338863
100644
(file)
--- a/
libavcodec/sgidec.c
+++ b/
libavcodec/sgidec.c
@@
-145,7
+145,7
@@
static int read_rle_sgi(uint8_t *out_buf, SgiState *s)
for (z = 0; z < s->depth; z++) {
dest_row = out_buf;
for (y = 0; y < s->height; y++) {
- linesize = s->width * s->depth
* s->bytes_per_channel
;
+ linesize = s->width * s->depth;
dest_row -= s->linesize;
start_offset = bytestream2_get_be32(&g_table);
bytestream2_seek(&s->g, start_offset, SEEK_SET);