virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec/exr: add missed hunks from previous exr commit

Browse Source
This commit is contained in:
Martin Vignali 2016-06-25 18:24:12 +02:00 committed by Paul B Mahol
parent 1e38791b7f
commit d96b8144c0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/exr.c
View File

@ -980,12 +980,19 @@ static int b44_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
} }
target_channel_offset += 2; target_channel_offset += 2;
} else {/* Float or UINT 32 channel */ } else {/* Float or UINT 32 channel */
if (stayToUncompress < td->ysize * td->xsize * 4) {
av_log(s, AV_LOG_ERROR, "Not enough data for uncompress channel: %d", stayToUncompress);
return AVERROR_INVALIDDATA;
}
for (y = 0; y < td->ysize; y++) { for (y = 0; y < td->ysize; y++) {
indexOut = target_channel_offset * td->xsize + y * td->channel_line_size; indexOut = target_channel_offset * td->xsize + y * td->channel_line_size;
memcpy(&td->uncompressed_data[indexOut], sr, td->xsize * 4); memcpy(&td->uncompressed_data[indexOut], sr, td->xsize * 4);
sr += td->xsize * 4; sr += td->xsize * 4;
} }
target_channel_offset += 4; target_channel_offset += 4;
stayToUncompress -= td->ysize * td->xsize * 4;
} }
} }