sanity check preview attribute sizes

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
AcademySoftwareFoundation · Aug 9, 2020 · 3cf874c · 3cf874c
1 parent 849c677
commit 3cf874c
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp b/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp
@@ -83,6 +83,17 @@ PreviewImageAttribute::readValueFrom (OPENEXR_IMF_INTERNAL_NAMESPACE::IStream &i
     Xdr::read <StreamIO> (is, width);
     Xdr::read <StreamIO> (is, height);
 
+    if (width < 0 || height < 0)
+    {
+        throw IEX_NAMESPACE::InputExc("Invalid dimensions in Preview Image Attribute");
+    }
+
+    // total attribute size should be four bytes per pixel + 8 bytes for width and height dimensions
+    if (static_cast<Int64>(width) * static_cast<Int64>(height) * 4l + 8l != static_cast<Int64>(size) )
+    {
+        throw IEX_NAMESPACE::InputExc("Mismatch between Preview Image Attribute size and dimensions");
+    }
+
     PreviewImage p (width, height);
 
     int numPixels = p.width() * p.height();