pel · weberhofer · Nov 18, 2017 · Nov 15, 2017 · Nov 17, 2017 · Nov 17, 2017
diff --git a/src/PelIfd.php b/src/PelIfd.php
@@ -344,8 +344,13 @@ public function load(PelDataWindow $d, $offset)
                     }
 
                     if ($starting_offset != $o) {
-                        $this->sub[$type] = new PelIfd($type);
-                        $this->sub[$type]->load($d, $o);
+                        $ifd = new PelIfd($type);
+                        try {
+                            $ifd->load($d, $o);
+                            $this->sub[$type] = $ifd;
+                        } catch (PelDataWindowOffsetException $e) {
+                            Pel::maybeThrow(new PelIfdException($e->getMessage()));
+                        }
                     } else {
                         Pel::maybeThrow(new PelIfdException('Bogus offset to next IFD: %d, same as offset being loaded from.', $o));
                     }
@@ -760,7 +765,11 @@ private function safeSetThumbnail(PelDataWindow $d, $offset, $length)
             }
 
             /* Now set the thumbnail normally. */
-            $this->setThumbnail($d->getClone($offset, $length));
+            try {
+                $this->setThumbnail($d->getClone($offset, $length));
+            } catch (PelDataWindowWindowException $e) {
+                Pel::maybeThrow(new PelIfdException($e->getMessage()));
+            }
         }
     }
 

diff --git a/test/Bug2979466Test.php → test/BrokenImagesTest.php b/test/Bug2979466Test.php → test/BrokenImagesTest.php
@@ -25,11 +25,20 @@
 use lsolesen\pel\PelJpeg;
 use PHPUnit\Framework\TestCase;
 
-class Bug2979466Test extends TestCase
+class BrokenImagesTest extends TestCase
 {
-    function testParsingNotFailingOnRecursingIfd()
+    public function testWindowWindowExceptionIsCaught()
     {
-        $file = dirname(__FILE__) . '/images/bug2979466.jpg';
-        $jpeg = new PelJpeg($file);
+        new PelJpeg(dirname(__FILE__) . '/broken_images/gh-10-a.jpg');
+    }
+
+    public function testWindowOffsetExceptionIsCaught()
+    {
+        new PelJpeg(dirname(__FILE__) . '/broken_images/gh-10-b.jpg');
+    }
+
+    public function testParsingNotFailingOnRecursingIfd()
+    {
+        new PelJpeg(dirname(__FILE__) . '/broken_images/gh-11.jpg');
     }
 }
diff --git a/test/Bug1730993Test.php b/test/Bug1730993Test.php
diff --git a/test/images/bug1730993_large.jpg → test/broken_images/gh-10-a.jpg b/test/images/bug1730993_large.jpg → test/broken_images/gh-10-a.jpg
diff --git a/test/broken_images/gh-10-b.jpg b/test/broken_images/gh-10-b.jpg
diff --git a/test/images/bug2979466.jpg → test/broken_images/gh-11.jpg b/test/images/bug2979466.jpg → test/broken_images/gh-11.jpg
diff --git a/test/images/bug1730993_tmp.jpg b/test/images/bug1730993_tmp.jpg