Gracefully handle invalid IPTC data (#53)

LycheeOrg · Aug 25, 2022 · e60845c · e60845c
1 parent a5daecb
commit e60845c
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/lib/PHPExif/Adapter/ImageMagick.php b/lib/PHPExif/Adapter/ImageMagick.php
@@ -13,6 +13,7 @@
 
 use PHPExif\Exif;
 use Imagick;
+use Safe\Exceptions\ImageException;
 
 use function Safe\filesize;
 use function Safe\iptcparse;
@@ -105,7 +106,11 @@ public function getExifFromFile(string $file) : Exif
     public function getIptcData(string $profile) : array
     {
         $arrData = [];
-        $iptc = iptcparse($profile);
+        try {
+            $iptc = iptcparse($profile);
+        } catch (ImageException) {
+            return $arrData;
+        }
 
         foreach ($this->iptcMapping as $name => $field) {
             if (!isset($iptc[$field])) {

diff --git a/lib/PHPExif/Adapter/Native.php b/lib/PHPExif/Adapter/Native.php
@@ -258,7 +258,11 @@ public function getIptcData(string $file) : array
         getimagesize($file, $info);
         $arrData = array();
         if (isset($info['APP13'])) {
-            $iptc = iptcparse($info['APP13']);
+            try {
+                $iptc = iptcparse($info['APP13']);
+            } catch (ImageException) {
+                return $arrData;
+            }
 
             foreach ($this->iptcMapping as $name => $field) {
                 if (!isset($iptc[$field])) {

diff --git a/tests/PHPExif/Adapter/ImageMagickTest.php b/tests/PHPExif/Adapter/ImageMagickTest.php
@@ -27,4 +27,15 @@ public function testGetExifFromFile()
         $this->assertNotEmpty($result->getRawData());
     }
 
+    /**
+     * @group ImageMagick
+     * @covers \PHPExif\Adapter\ImageMagick::getIptcData
+     */
+    public function testGetEmptyIptcData()
+    {
+        $result = $this->adapter->getIptcData("");
+
+        $this->assertEquals([], $result);
+    }
+
 }
diff --git a/tests/PHPExif/Adapter/NativeTest.php b/tests/PHPExif/Adapter/NativeTest.php
@@ -145,6 +145,18 @@ public function testGetIptcData()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * @group native
+     * @covers \PHPExif\Adapter\Native::getIptcData
+     */
+    public function testGetEmptyIptcData()
+    {
+        $file = PHPEXIF_TEST_ROOT . '/files/empty_iptc.jpg';
+        $result = $this->adapter->getIptcData($file);
+
+        $this->assertEquals([], $result);
+    }
+
     /**
      * @group native
      * @covers \PHPExif\Adapter\Native::setSectionsAsArrays

diff --git a/tests/files/empty_iptc.jpg b/tests/files/empty_iptc.jpg