[FFmpeg-devel] [PATCH 1/5] exr: check version too

[Paul B Mahol]

Separate version from flags.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 libavcodec/exr.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index fef0d10..157847a 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -236,7 +236,7 @@ static int decode_frame(AVCodecContext *avctx,
     AVFrame *const p = &s->picture;
     uint8_t *ptr;
 
-    int i, x, y, stride, magic_number, version_flag, ret;
+    int i, x, y, stride, magic_number, version, flags, ret;
     int w = 0;
     int h = 0;
     unsigned int xmin   = ~0;
@@ -270,8 +270,14 @@ static int decode_frame(AVCodecContext *avctx,
         return AVERROR_INVALIDDATA;
     }
 
-    version_flag = bytestream_get_le32(&buf);
-    if ((version_flag & 0x200) == 0x200) {
+    version = bytestream_get_byte(&buf);
+    if (version != 2) {
+        av_log(avctx, AV_LOG_ERROR, "Unsupported version %d\n", version);
+        return AVERROR_PATCHWELCOME;
+    }
+
+    flags = bytestream_get_le24(&buf);
+    if (flags & 0x2) {
         av_log(avctx, AV_LOG_ERROR, "Tile based images are not supported\n");
         return AVERROR_PATCHWELCOME;
     }
-- 
1.7.11.4