fix(tiff): more care ignoring XMP tags that should not be used (AcademySoftwareFoundation#5162)

Guard against corrupt XMP blocks with TIFF related names: if the XMP
item starts with "tiff:", just ignore it if it's not one of the few
TIFF-related XMP items we recognize of if it's marked redundant, and
don't *replace* a TIFF related item that already had a value in the
spec.

Fixes AcademySoftwareFoundation#5157

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

src/libOpenImageIO/xmp.cpp

@@ -294,13 +294,14 @@ add_attrib(ImageSpec& spec, string_view xmlname, string_view xmlvalue,
 
     // See if it's in the xmp table, which will tell us something about the
     // proper type (everything in the xml itself just looks like a string).
-    if (const XMPtag* xt = xmp_tagmap_ref().find(xmlname)) {
-        if (!xt->oiioname || !xt->oiioname[0])
+    const XMPtag* xmptagptr = xmp_tagmap_ref().find(xmlname);
+    if (xmptagptr) {
+        if (!xmptagptr->oiioname || !xmptagptr->oiioname[0])
             return 0;  // ignore it purposefully
         // Found
-        oiioname = xt->oiioname;
-        oiiotype = xt->oiiotype;
-        special  = xt->special;
+        oiioname = xmptagptr->oiioname;
+        oiiotype = xmptagptr->oiiotype;
+        special  = xmptagptr->special;
     }
 
     // Also try looking it up to see if it's a known exif tag.
@@ -325,6 +326,21 @@ add_attrib(ImageSpec& spec, string_view xmlname, string_view xmlvalue,
             return 0;  // skip
     }
 
+    if (Strutil::istarts_with(xmlname, "tiff:")) {
+        if (!xmptagptr)  // Ignore any "tiff:" entry not in the table
+            return 0;
+        if (special & TiffRedundant)  // Ignore ones marked redundant
+            return 0;
+        // Ignore any TIFF related ones we already have set in the spec, don't
+        // let the XMP version overwrite what we gleaned directly from the
+        // file.
+        if (spec.find_attribute(oiioname))
+            return 0;
+    }
+
+    if (special & Suppress)
+        return 0;  // Marked as one to suppress
+
     // Guess the type if unknown
     if (oiiotype == TypeUnknown) {
         if (Strutil::string_is_int(xmlvalue))