summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AK/JsonValue.cpp2
-rw-r--r--Tests/AK/TestJSON.cpp2
-rw-r--r--Userland/Libraries/LibJS/Tests/builtins/JSON/JSON.parse.js1
3 files changed, 2 insertions, 3 deletions
diff --git a/AK/JsonValue.cpp b/AK/JsonValue.cpp
index 9a6536b619..f11fd4bc11 100644
--- a/AK/JsonValue.cpp
+++ b/AK/JsonValue.cpp
@@ -236,8 +236,6 @@ void JsonValue::clear()
#ifndef KERNEL
ErrorOr<JsonValue> JsonValue::from_string(StringView input)
{
- if (input.is_empty())
- return JsonValue();
return JsonParser(input).parse();
}
#endif
diff --git a/Tests/AK/TestJSON.cpp b/Tests/AK/TestJSON.cpp
index 36f0b8cebc..c55d21ed66 100644
--- a/Tests/AK/TestJSON.cpp
+++ b/Tests/AK/TestJSON.cpp
@@ -126,7 +126,7 @@ TEST_CASE(json_u64_roundtrip)
TEST_CASE(json_parse_empty_string)
{
auto value = JsonValue::from_string("");
- EXPECT_EQ(value.value().is_null(), true);
+ EXPECT_EQ(value.is_error(), true);
}
TEST_CASE(json_parse_long_decimals)
diff --git a/Userland/Libraries/LibJS/Tests/builtins/JSON/JSON.parse.js b/Userland/Libraries/LibJS/Tests/builtins/JSON/JSON.parse.js
index a05e579e2a..ff4d4bd30e 100644
--- a/Userland/Libraries/LibJS/Tests/builtins/JSON/JSON.parse.js
+++ b/Userland/Libraries/LibJS/Tests/builtins/JSON/JSON.parse.js
@@ -29,6 +29,7 @@ test("syntax errors", () => {
"[1,2,3, ]",
'{ "foo": "bar",}',
'{ "foo": "bar", }',
+ "",
].forEach(test => {
expect(() => {
JSON.parse(test);