Don't crash if s > size.

Exiv2 · Jun 23, 2021 · 0c17eb3 · 0c17eb3
1 parent cdda410
commit 0c17eb3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp
@@ -1246,9 +1246,10 @@ namespace Exiv2 {
         for (ExifData::const_iterator i = b; i != e; ++i) {
             if (i->ifdId() != ifdId) continue;
             const uint16_t s = i->tag()*2 + static_cast<uint16_t>(i->size());
-            assert(s <= size);
-            if (len < s) len = s;
-            i->copy(buf.pData_ + i->tag()*2, byteOrder);
+            if (s <= size) {
+                if (len < s) len = s;
+                i->copy(buf.pData_ + i->tag()*2, byteOrder);
+            }
         }
         // Round the size to make it even.
         buf.size_ = len + len%2;