mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-08-17 09:20:28 +03:00
LibJS: Allow negative pointers in Value
Also ensure that all a nullptr input gives null object and you don't accidentally dereference a nullptr.
This commit is contained in:
parent
325263f0e8
commit
d4736d17ae
Notes:
sideshowbarker
2024-07-17 07:18:37 +09:00
Author: https://github.com/davidot Commit: https://github.com/SerenityOS/serenity/commit/d4736d17ae Pull-request: https://github.com/SerenityOS/serenity/pull/15151 Reviewed-by: https://github.com/linusg
@ -759,6 +759,7 @@ if (BUILD_LAGOM)
|
|||||||
# Extra tests from Tests/LibJS
|
# Extra tests from Tests/LibJS
|
||||||
lagom_test(../../Tests/LibJS/test-invalid-unicode-js.cpp LIBS LibJS)
|
lagom_test(../../Tests/LibJS/test-invalid-unicode-js.cpp LIBS LibJS)
|
||||||
lagom_test(../../Tests/LibJS/test-bytecode-js.cpp LIBS LibJS)
|
lagom_test(../../Tests/LibJS/test-bytecode-js.cpp LIBS LibJS)
|
||||||
|
lagom_test(../../Tests/LibJS/test-value-js.cpp LIBS LibJS)
|
||||||
|
|
||||||
# Spreadsheet
|
# Spreadsheet
|
||||||
add_executable(test-spreadsheet_lagom
|
add_executable(test-spreadsheet_lagom
|
||||||
|
@ -8,3 +8,6 @@ link_with_locale_data(test-invalid-unicode-js)
|
|||||||
|
|
||||||
serenity_test(test-bytecode-js.cpp LibJS LIBS LibJS)
|
serenity_test(test-bytecode-js.cpp LibJS LIBS LibJS)
|
||||||
link_with_locale_data(test-bytecode-js)
|
link_with_locale_data(test-bytecode-js)
|
||||||
|
|
||||||
|
serenity_test(test-value-js.cpp LibJS LIBS LibJS)
|
||||||
|
link_with_locale_data(test-value-js)
|
||||||
|
113
Tests/LibJS/test-value-js.cpp
Normal file
113
Tests/LibJS/test-value-js.cpp
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2022, David Tuin <davidot@serenityos.org>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <LibJS/Runtime/Value.h>
|
||||||
|
#include <LibTest/TestCase.h>
|
||||||
|
|
||||||
|
using namespace JS;
|
||||||
|
|
||||||
|
template<typename Type>
|
||||||
|
static void test_nullptr_input()
|
||||||
|
{
|
||||||
|
Type* ptr = nullptr;
|
||||||
|
JS::Value val { ptr };
|
||||||
|
EXPECT(val.is_null());
|
||||||
|
EXPECT(!val.is_object());
|
||||||
|
EXPECT(!val.is_string());
|
||||||
|
EXPECT(!val.is_bigint());
|
||||||
|
EXPECT(!val.is_symbol());
|
||||||
|
EXPECT(!val.is_accessor());
|
||||||
|
EXPECT(!val.is_cell());
|
||||||
|
EXPECT(!val.is_number());
|
||||||
|
EXPECT(!val.is_undefined());
|
||||||
|
}
|
||||||
|
|
||||||
|
#define TEST_NULLPTR_INPUT(type) \
|
||||||
|
TEST_CASE(value_nullptr_input_##type) \
|
||||||
|
{ \
|
||||||
|
test_nullptr_input<type>(); \
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_NULLPTR_INPUT(Object);
|
||||||
|
TEST_NULLPTR_INPUT(PrimitiveString);
|
||||||
|
TEST_NULLPTR_INPUT(Symbol);
|
||||||
|
TEST_NULLPTR_INPUT(BigInt);
|
||||||
|
TEST_NULLPTR_INPUT(Accessor);
|
||||||
|
|
||||||
|
#undef TEST_NULLPTR_INPUT
|
||||||
|
|
||||||
|
// Unfortunately we don't have a way to get the pointer without it being dereferenced
|
||||||
|
// so we just use the same logic, this is dangerous if Value is ever changed!
|
||||||
|
static u64 extract_pointer(u64 ptr)
|
||||||
|
{
|
||||||
|
return (u64)(((i64)(ptr << 16)) >> 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_CASE(valid_pointer_in_gives_same_pointer_out)
|
||||||
|
{
|
||||||
|
if (sizeof(void*) < sizeof(double))
|
||||||
|
return;
|
||||||
|
|
||||||
|
#define EXPECT_POINTER_TO_SURVIVE(input) \
|
||||||
|
{ \
|
||||||
|
JS::Value value(reinterpret_cast<Object*>(static_cast<u64>(input))); \
|
||||||
|
EXPECT(value.is_object()); \
|
||||||
|
EXPECT(!value.is_null()); \
|
||||||
|
auto extracted_pointer = extract_pointer(value.encoded()); \
|
||||||
|
EXPECT_EQ(static_cast<u64>(input), extracted_pointer); \
|
||||||
|
}
|
||||||
|
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0x1);
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0x10);
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0x100);
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0x00007fffffffffff);
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0x0000700000000000);
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0x0000100000000000);
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0xffff800000000000);
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0xffff800000000001);
|
||||||
|
EXPECT_POINTER_TO_SURVIVE(0xffff800000000010);
|
||||||
|
|
||||||
|
#undef EXPECT_POINTER_TO_SURVIVE
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_CASE(non_canon_nans)
|
||||||
|
{
|
||||||
|
#define EXPECT_TO_BE_NAN(input) \
|
||||||
|
{ \
|
||||||
|
Value val { bit_cast<double>(input) }; \
|
||||||
|
EXPECT(val.is_nan()); \
|
||||||
|
EXPECT(val.is_number()); \
|
||||||
|
EXPECT(!val.is_integral_number()); \
|
||||||
|
EXPECT(!val.is_finite_number()); \
|
||||||
|
EXPECT(!val.is_infinity()); \
|
||||||
|
EXPECT(!val.is_empty()); \
|
||||||
|
EXPECT(!val.is_nullish()); \
|
||||||
|
}
|
||||||
|
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | 0x1);
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | 0x10);
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | (NULL_TAG << TAG_SHIFT));
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | (UNDEFINED_TAG << TAG_SHIFT));
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | (INT32_TAG << TAG_SHIFT) | 0x88);
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | (OBJECT_TAG << TAG_SHIFT));
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | (OBJECT_TAG << TAG_SHIFT) | 0x1230);
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | (STRING_TAG << TAG_SHIFT));
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | (STRING_TAG << TAG_SHIFT) | 0x1230);
|
||||||
|
|
||||||
|
u64 sign_bit = 1ULL << 63;
|
||||||
|
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | 0x1);
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | 0x10);
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | (NULL_TAG << TAG_SHIFT));
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | (UNDEFINED_TAG << TAG_SHIFT));
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | (INT32_TAG << TAG_SHIFT) | 0x88);
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | (OBJECT_TAG << TAG_SHIFT));
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | (OBJECT_TAG << TAG_SHIFT) | 0x1230);
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | (STRING_TAG << TAG_SHIFT));
|
||||||
|
EXPECT_TO_BE_NAN(CANON_NAN_BITS | sign_bit | (STRING_TAG << TAG_SHIFT) | 0x1230);
|
||||||
|
|
||||||
|
#undef EXPECT_TO_BE_NAN
|
||||||
|
}
|
@ -251,7 +251,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
Value(Object const* object)
|
Value(Object const* object)
|
||||||
: Value(object ? (OBJECT_TAG << TAG_SHIFT) : (NULL_TAG << TAG_SHIFT), reinterpret_cast<void const*>(object))
|
: Value(OBJECT_TAG << TAG_SHIFT, reinterpret_cast<void const*>(object))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -401,7 +401,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
Value(u64 tag, u64 val)
|
Value(u64 tag, u64 val)
|
||||||
{
|
{
|
||||||
VERIFY((tag & ~TAG_EXTRACTION) == 0);
|
|
||||||
VERIFY(!(tag & val));
|
VERIFY(!(tag & val));
|
||||||
m_value.encoded = tag | val;
|
m_value.encoded = tag | val;
|
||||||
}
|
}
|
||||||
@ -409,16 +408,24 @@ private:
|
|||||||
template<typename PointerType>
|
template<typename PointerType>
|
||||||
Value(u64 tag, PointerType const* ptr)
|
Value(u64 tag, PointerType const* ptr)
|
||||||
{
|
{
|
||||||
VERIFY((tag & ~TAG_EXTRACTION) == 0);
|
if (!ptr) {
|
||||||
VERIFY((tag & TAG_EXTRACTION) != 0);
|
// Make sure all nullptrs are null
|
||||||
// Cell tag bit must be set or this is a nullptr
|
m_value.tag = NULL_TAG;
|
||||||
VERIFY((tag & 0x8000000000000000ul) == 0x8000000000000000ul || !ptr);
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
VERIFY((tag & 0x8000000000000000ul) == 0x8000000000000000ul);
|
||||||
|
|
||||||
if constexpr (sizeof(PointerType*) < sizeof(u64)) {
|
if constexpr (sizeof(PointerType*) < sizeof(u64)) {
|
||||||
m_value.encoded = tag | reinterpret_cast<u32>(ptr);
|
m_value.encoded = tag | reinterpret_cast<u32>(ptr);
|
||||||
} else {
|
} else {
|
||||||
VERIFY(!(reinterpret_cast<u64>(ptr) & TAG_EXTRACTION));
|
// NOTE: Pointers in x86-64 use just 48 bits however are supposed to be
|
||||||
m_value.encoded = tag | reinterpret_cast<u64>(ptr);
|
// sign extended up from the 47th bit.
|
||||||
|
// This means that all bits above the 47th should be the same as
|
||||||
|
// the 47th. When storing a pointer we thus drop the top 16 bits as
|
||||||
|
// we can recover it when extracting the pointer again.
|
||||||
|
// See also: Value::extract_pointer.
|
||||||
|
m_value.encoded = tag | (reinterpret_cast<u64>(ptr) & 0x0000ffffffffffffULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user