diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index d20930f2..fa5fd71c 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -175,6 +175,13 @@ namespace Exiv2 {
 #ifdef DEBUG
         std::cerr << "pPsData doesn't start with '8BIM'\n";
 #endif
+        if (position < sizePsData) {
+#ifndef SUPPRESS_WARNINGS
+            std::cerr << "Warning: "
+                      << "Invalid or extended Photoshop IRB\n";
+#endif
+            return -2;
+        }
         return 3;
     } // Photoshop::locateIrb