[FFmpeg-cvslog] exr: make sure that data_size is not bigger than expected

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Feb 24 14:10:20 2013 +0000| [7b12554c5abca0eb63ddbdfdf6f11c76b9230a0c] | committer: Paul B Mahol

exr: make sure that data_size is not bigger than expected

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b12554c5abca0eb63ddbdfdf6f11c76b9230a0c
---

 libavcodec/exr.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 59144a2..cef5e0c 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -270,7 +270,8 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
     uncompressed_size = s->scan_line_size * FFMIN(s->scan_lines_per_block, s->ymax - line + 1);
     if ((s->compr == EXR_RAW && (data_size != uncompressed_size ||
                                  line_offset > buf_size - uncompressed_size)) ||
-        (s->compr != EXR_RAW && line_offset > buf_size - data_size)) {
+        (s->compr != EXR_RAW && (data_size > uncompressed_size ||
+                                 line_offset > buf_size - data_size))) {
         return AVERROR_INVALIDDATA;
     }