Merge pull request #5 from biigle/patch-1

Make parser more robust against invalid JSON
biigle · Sep 4, 2024 · 328b829 · 328b829
2 parents 531ba5a + cdd25d2
commit 328b829
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/Ifdo.php b/src/Ifdo.php
@@ -84,27 +84,21 @@ public function getJsonData()
     public function getImageSetHeader()
     {
         $arr = $this->getJsonData();
-        if (array_key_exists('image-set-header', $arr))
-        {
+        if (is_array($arr) && array_key_exists('image-set-header', $arr)) {
             return $arr['image-set-header'];
         }
-        else
-        {
-            return [];
-        }
+
+        return [];
     }
 
     public function getImageSetItems()
     {
         $arr = $this->getJsonData();
-        if (array_key_exists('image-set-items', $arr))
-        {
+        if (is_array($arr) && array_key_exists('image-set-items', $arr)) {
             return $arr['image-set-items'];
         }
-        else
-        {
-            return [];
-        }
+
+        return [];
     }
 
     public function getIfdoVersion(): String

diff --git a/tests/IfdoTest.php b/tests/IfdoTest.php
@@ -35,4 +35,12 @@ public function testStrictMode()
         $this->expectException(\Exception::class);
         Ifdo::fromString('{"some": "json"}', true);
     }
+
+    public function testInvalidJson()
+    {
+        $obj = Ifdo::fromString('{"some": "json",}');
+        $this->assertSame(null, $obj->getJsonData());
+        $this->assertSame([], $obj->getImageSetHeader());
+        $this->assertSame([], $obj->getImageSetItems());
+    }
 }