avcodec/exr: export any unknown header string variable to metadata

And properly skip preview type in header.

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 1ae6012ec46efaad35edfc863d03c3dff1ed1b05..cacdff57740bb954817f20a585783d8f7eccf5d2 100644 (file)
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1337,7 +1337,7 @@ static int decode_header(EXRContext *s, AVFrame *frame)
 {
     AVDictionary *metadata = NULL;
     GetByteContext *gb = &s->gb;
-    int magic_number, version, i, flags;
+    int magic_number, version, flags;
     int layer_match = 0;
     int ret;
     int dup_channels = 0;
@@ -1731,6 +1731,18 @@ static int decode_header(EXRContext *s, AVFrame *frame)
                 strncmp("tiledimage", key, var_size))
                 return AVERROR_PATCHWELCOME;
 
+            continue;
+        } else if ((var_size = check_header_variable(s, "preview",
+                                                     "preview", 16)) >= 0) {
+            uint32_t pw = bytestream2_get_le32(gb);
+            uint32_t ph = bytestream2_get_le32(gb);
+            int64_t psize = 4LL * pw * ph;
+
+            if (psize >= bytestream2_get_bytes_left(gb))
+                return AVERROR_INVALIDDATA;
+
+            bytestream2_skip(gb, psize);
+
             continue;
         }
 
@@ -1742,11 +1754,30 @@ static int decode_header(EXRContext *s, AVFrame *frame)
         }
 
         // Process unknown variables
-        for (i = 0; i < 2; i++) // value_name and value_type
-            while (bytestream2_get_byte(gb) != 0);
+        {
+            uint8_t name[256] = { 0 };
+            uint8_t type[256] = { 0 };
+            uint8_t value[256] = { 0 };
+            int i = 0, size;
+
+            while (bytestream2_get_bytes_left(gb) > 0 &&
+                   bytestream2_peek_byte(gb) && i < 255) {
+                name[i++] = bytestream2_get_byte(gb);
+            }
 
-        // Skip variable length
-        bytestream2_skip(gb, bytestream2_get_le32(gb));
+            bytestream2_skip(gb, 1);
+            i = 0;
+            while (bytestream2_get_bytes_left(gb) > 0 &&
+                   bytestream2_peek_byte(gb) && i < 255) {
+                type[i++] = bytestream2_get_byte(gb);
+            }
+            bytestream2_skip(gb, 1);
+            size = bytestream2_get_le32(gb);
+
+            bytestream2_get_buffer(gb, value, FFMIN(sizeof(value) - 1, size));
+            if (!strcmp(type, "string"))
+                av_dict_set(&metadata, name, value, 0);
+        }
     }
 
     if (s->compression == EXR_UNKN) {