SerializePlugin: Fix null parsing

jnvsor · Aug 23, 2024 · c534c9e · c534c9e
1 parent 858e591
commit c534c9e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/build/kint.phar b/build/kint.phar
diff --git a/src/Parser/SerializePlugin.php b/src/Parser/SerializePlugin.php
@@ -71,9 +71,11 @@ public function parse(&$var, Value &$o, int $trigger): void
 
         $options = ['allowed_classes' => self::$allowed_classes];
 
+        $ran = false;
         if (!self::$safe_mode || !\in_array($trimmed[0], ['C', 'O', 'a'], true)) {
             // Suppress warnings on unserializeable variable
             $data = @\unserialize($trimmed, $options);
+            $ran = true;
 
             if (false === $data && 'b:0;' !== \substr($trimmed, 0, 4)) {
                 return;
@@ -94,7 +96,7 @@ public function parse(&$var, Value &$o, int $trigger): void
 
         $r = new Representation('Serialized');
 
-        if (isset($data)) {
+        if ($ran) {
             $r->contents = $this->getParser()->parse($data, $base_obj);
         } else {
             $base_obj->hints[] = 'blacklist';

diff --git a/tests/Parser/SerializePluginTest.php b/tests/Parser/SerializePluginTest.php
@@ -67,12 +67,16 @@ public function testParse()
         $b = new Value('$v');
         $b->access_path = '$v';
 
-        $v = \serialize(['obj' => $p]);
+        $v = \serialize(null);
         $obj = $p->parse($v, clone $b);
         $this->assertSame($v, $obj->value->contents);
 
         $p->addPlugin(new SerializePlugin($p));
 
+        $obj = $p->parse($v, clone $b);
+        $this->assertSame('null', $obj->getRepresentation('serialized')->contents->type);
+
+        $v = \serialize(['obj' => $p]);
         $obj = $p->parse($v, clone $b);
         $this->assertContains('blacklist', $obj->getRepresentation('serialized')->contents->hints);