Check if embedded RAF image is really a TIFF

Exiv2 · Jul 25, 2021 · be12ae6 · be12ae6
1 parent c4861fe
commit be12ae6
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/rafimage.cpp b/src/rafimage.cpp
@@ -364,17 +364,25 @@ namespace Exiv2 {
         // sanity check.  Does tiff lie inside the file?
         enforce(Safe::add(tiffOffset, tiffLength) <= io_->size(), kerCorruptedMetadata);
 
-        DataBuf  tiff(tiffLength);
         if (io_->seek(tiffOffset, BasicIo::beg) != 0) throw Error(kerFailedToReadImageData);
-        io_->read(tiff.pData_, tiff.size_);
 
-        if (!io_->error() && !io_->eof())
+        // check if this really is a tiff (some older models just embed a raw bitstream)
+        io_->read(readBuff, 4);
+        io_->seek(-4, BasicIo::cur);
+        if (memcmp(readBuff, "\x49\x49\x2A\x00", 4) == 0 ||
+            memcmp(readBuff, "\x4D\x4D\x00\x2A", 4) == 0)
         {
-            TiffParser::decode(exifData_,
-                               iptcData_,
-                               xmpData_,
-                               tiff.pData_,
-                               tiff.size_);
+            DataBuf  tiff(tiffLength);
+            io_->read(tiff.pData_, tiff.size_);
+
+            if (!io_->error() && !io_->eof())
+            {
+                TiffParser::decode(exifData_,
+                                   iptcData_,
+                                   xmpData_,
+                                   tiff.pData_,
+                                   tiff.size_);
+            }
         }
     } // RafImage::readMetadata