From 470fef0c3b772bf24ed161641ae9d2bd92fac4fa Mon Sep 17 00:00:00 2001
From: Christian Schneider
Date: Tue, 25 Mar 2025 03:15:58 +0100
Subject: Handle pretty printed null including newlines in it::json_decode

---
 it.class  | 2 +-
 test/it.t | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/it.class b/it.class
index 0733819..b93d49a 100644
--- a/it.class
+++ b/it.class
@@ -1263,7 +1263,7 @@ static function json_encode($data, $p = [])
  */
 static function json_decode($json, $p = [])
 {
-	return ($data = json_decode($json, $p['assoc'])) === null && $json != 'null' ? it::error((array)$p['it_error'] + ['title' => "invalid json", 'body' => $json]) : $data;
+	return ($data = json_decode($json, $p['assoc'])) === null && trim($json) != 'null' ? it::error((array)$p['it_error'] + ['title' => "invalid json", 'body' => $json]) : $data;
 }
 
 /**
diff --git a/test/it.t b/test/it.t
index cee4fa6..535f185 100755
--- a/test/it.t
+++ b/test/it.t
@@ -481,6 +481,7 @@ foreach ([$dummy, false, true, null, 1, "a", "Ä", "/", []] as $var)
 	is(it::json_decode(it::json_encode($var)), $var);
 is(it::json_decode('{"foo":"bar"}')->foo, "bar");
 is(it::json_decode('{"foo":"bar"}', ['assoc' => true])['foo'], "bar");
+is(it::json_decode("\nnull\n\n", ['it_error' => ['fatal' => true]]), null, 'json_decode pretty printed null value');
 
 is(it::cdist(null), true);
 is(it::cdist(), true);
-- 
cgit v1.2.3