system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-05 21:29:59 +00:00
Code Issues Projects Releases Wiki Activity

AK+LibJS: Remove error-prone JsonValue constructor

Browse Source 
Consider the following:

    JsonValue value { JsonValue::Type::Object };
    value.as_object().set("foo"sv, "bar"sv);

The JsonValue(Type) constructor does not initialize the underlying union
that stores its value. Thus JsonValue::as_object() will A) refer to an
uninitialized union member, B) deference that member.

This constructor only has 2 users, both of which initialize the type to
Type::Null. Rather than implementing unused functionality here, replace
those uses with the default JsonValue constructor, and remove the faulty
constructor.
This commit is contained in:
Timothy Flynn 2023-10-31 16:02:26 -04:00 committed by Tim Flynn
parent 53d73b95ce
commit f630a5ca71
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AK/JsonParser.cpp
View File

@ -304,7 +304,7 @@ ErrorOr<JsonValue> JsonParser::parse_null()
{
if (!consume_specific("null"))
return Error::from_string_literal("JsonParser: Expected 'null'");
return JsonValue(JsonValue::Type::Null);
return JsonValue {};
}
ErrorOr<JsonValue> JsonParser::parse_helper()

5
AK/JsonValue.cpp
View File

@ -15,11 +15,6 @@
namespace AK {
JsonValue::JsonValue(Type type)
: m_type(type)
{
}
JsonValue::JsonValue(JsonValue const& other)
{
copy_from(other);

1
AK/JsonValue.h
View File

@ -36,7 +36,6 @@ public:
static ErrorOr<JsonValue> from_string(StringView);
JsonValue() = default;
explicit JsonValue(Type);
~JsonValue() { clear(); }
JsonValue(JsonValue const&);

4
Tests/LibJS/test262-runner.cpp
View File

@ -753,7 +753,7 @@ int main(int argc, char** argv)
if (!output.contains("Test262:AsyncTestComplete"sv) || output.contains("Test262:AsyncTestFailure"sv)) {
result_object.set("async_fail", true);
if (!first_output.has_value())
result_object.set("output", JsonValue { AK::JsonValue::Type::Null });
result_object.set("output", JsonValue {});
passed = false;
}
@ -778,7 +778,7 @@ int main(int argc, char** argv)
if (!output.contains("Test262:AsyncTestComplete"sv) || output.contains("Test262:AsyncTestFailure"sv)) {
result_object.set("async_fail", true);
if (!first_output.has_value())
result_object.set("output", JsonValue { AK::JsonValue::Type::Null });
result_object.set("output", JsonValue {});
passed = false;
}