Don't deref end iterator.

kevinbackhouse · Jul 9, 2021 · 033175e · 033175e
1 parent f8ae929
commit 033175e
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp
@@ -2750,6 +2750,7 @@ namespace Exiv2 {
         if (pos == metadata->end() || pos->value().count() < 3 || pos->value().typeId() != unsignedShort ||
             pos->value().toFloat(2) == 0.0F) {
             os << "Unknown Lens (" << lensType << ")";
+            return os;
         }
 
         int const exifFlMin = static_cast<int>(static_cast<float>(pos->value().toLong(1)) / pos->value().toFloat(2));
@@ -2759,6 +2760,7 @@ namespace Exiv2 {
         pos = metadata->findKey(aperKey);
         if (pos == metadata->end() || pos->value().count() != 1 || pos->value().typeId() != unsignedShort) {
             os << "Unknown Lens (" << lensType << ")";
+            return os;
         }
 
         auto exifAperMax = fnumber(canonEv(static_cast<int16_t>(pos->value().toLong(0))));