Commit 60ea0a52 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/sgi: Fix dereferencing uninitialized pointer

This also fixes the code so it decodes raw images correctly again
No release is affected by this

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 610a8b15
...@@ -138,10 +138,9 @@ static int read_uncompressed_sgi(unsigned char* out_buf, SgiState *s) ...@@ -138,10 +138,9 @@ static int read_uncompressed_sgi(unsigned char* out_buf, SgiState *s)
for (y = s->height - 1; y >= 0; y--) { for (y = s->height - 1; y >= 0; y--) {
out_end = out_buf + (y * s->linesize); out_end = out_buf + (y * s->linesize);
if (s->bytes_per_channel == 1) { if (s->bytes_per_channel == 1) {
for (x = s->width; x > 0; x--) { for (x = s->width; x > 0; x--)
bytestream2_get_bufferu(&gp[z], out_end, s->depth); for (z = 0; z < s->depth; z++)
out_end += s->depth; *out_end++ = bytestream2_get_byteu(&gp[z]);
}
} else { } else {
uint16_t *out16 = (uint16_t *)out_end; uint16_t *out16 = (uint16_t *)out_end;
for (x = s->width; x > 0; x--) for (x = s->width; x > 0; x--)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment