Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix global property access crash in raw context #915

Merged
merged 2 commits into from
Feb 14, 2025
Merged

Fix global property access crash in raw context #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b210b5d
Fix global property access crash in raw context
bnoordhuis Feb 14, 2025
3205a04
squash! also init global obj
bnoordhuis Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ jobs:
./build/qjs -c examples/hello.js -o hello
./hello

- name: test interrupt
- name: test api
run: |
./build/interrupt-test
./build/api-test

windows-msvc:
runs-on: windows-latest
Expand Down Expand Up @@ -197,9 +197,9 @@ jobs:
run: |
build\${{matrix.buildType}}\qjs.exe -c examples\hello.js -o hello.exe
.\hello.exe
- name: test interrupt
- name: test api
run: |
build\${{matrix.buildType}}\interrupt-test.exe
build\${{matrix.buildType}}\api-test.exe
- name: Set up Visual Studio shell
uses: egor-tensin/vs-shell@v2
with:
Expand Down Expand Up @@ -262,9 +262,9 @@ jobs:
build\${{matrix.buildType}}\qjs.exe examples\test_point.js
build\${{matrix.buildType}}\run-test262.exe -c tests.conf
build\${{matrix.buildType}}\function_source.exe
- name: test interrupt
- name: test api
run: |
build\${{matrix.buildType}}\interrupt-test.exe
build\${{matrix.buildType}}\api-test.exe

windows-ninja:
runs-on: windows-latest
Expand Down Expand Up @@ -294,9 +294,9 @@ jobs:
build\qjs.exe examples\test_point.js
build\run-test262.exe -c tests.conf
build\function_source.exe
- name: test interrupt
- name: test api
run: |
build\interrupt-test.exe
build\api-test.exe

windows-sdk:
runs-on: windows-latest
Expand Down Expand Up @@ -327,9 +327,9 @@ jobs:
build\${{matrix.buildType}}\qjs.exe examples\test_point.js
build\${{matrix.buildType}}\run-test262.exe -c tests.conf
build\${{matrix.buildType}}\function_source.exe
- name: test interrupt
- name: test api
run: |
build\${{matrix.buildType}}\interrupt-test.exe
build\${{matrix.buildType}}\api-test.exe

windows-mingw:
runs-on: windows-latest
Expand Down Expand Up @@ -380,9 +380,9 @@ jobs:
run: |
./build/qjs -c examples/hello.js -o hello.exe
./hello
- name: test interrupt
- name: test api
run: |
./build/interrupt-test
./build/api-test
windows-mingw-shared:
runs-on: windows-latest
defaults:
Expand Down Expand Up @@ -467,9 +467,9 @@ jobs:
- name: test
run: make test

- name: test interrupt
- name: test api
run: |
./build/interrupt-test
./build/api-test

openbsd:
runs-on: ubuntu-latest
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,11 @@ endif()
# Interrupt test
#

add_executable(interrupt-test
interrupt-test.c
add_executable(api-test
api-test.c
)
target_compile_definitions(interrupt-test PRIVATE ${qjs_defines})
target_link_libraries(interrupt-test qjs)
target_compile_definitions(api-test PRIVATE ${qjs_defines})
target_link_libraries(api-test qjs)

# Unicode generator
#
Expand Down
79 changes: 51 additions & 28 deletions interrupt-test.c → api-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
#ifdef NDEBUG
#undef NDEBUG
#endif
#include <assert.h>
#include <stdlib.h>
#include "quickjs.h"

#define MAX_TIME 10

#define expect(condition) \
do { \
if (!(condition)) { \
fprintf(stderr, "Failed: %s, file %s, line %d\n", \
#condition, __FILE__, __LINE__); \
exit(EXIT_FAILURE); \
} \
} while (0)

static int timeout_interrupt_handler(JSRuntime *rt, void *opaque)
{
int *time = (int *)opaque;
Expand All @@ -34,12 +29,12 @@ static void sync_call(void)
int time = 0;
JS_SetInterruptHandler(rt, timeout_interrupt_handler, &time);
JSValue ret = JS_Eval(ctx, code, strlen(code), "<input>", JS_EVAL_TYPE_GLOBAL);
expect(time > MAX_TIME);
expect(JS_IsException(ret));
assert(time > MAX_TIME);
assert(JS_IsException(ret));
JS_FreeValue(ctx, ret);
expect(JS_HasException(ctx));
assert(JS_HasException(ctx));
JSValue e = JS_GetException(ctx);
expect(JS_IsUncatchableError(ctx, e));
assert(JS_IsUncatchableError(ctx, e));
JS_FreeValue(ctx, e);
JS_FreeContext(ctx);
JS_FreeRuntime(rt);
Expand All @@ -61,26 +56,26 @@ static void async_call(void)
int time = 0;
JS_SetInterruptHandler(rt, timeout_interrupt_handler, &time);
JSValue ret = JS_Eval(ctx, code, strlen(code), "<input>", JS_EVAL_TYPE_GLOBAL);
expect(!JS_IsException(ret));
assert(!JS_IsException(ret));
JS_FreeValue(ctx, ret);
expect(JS_IsJobPending(rt));
assert(JS_IsJobPending(rt));
int r = 0;
while (JS_IsJobPending(rt)) {
r = JS_ExecutePendingJob(rt, &ctx);
}
expect(time > MAX_TIME);
expect(r == -1);
expect(JS_HasException(ctx));
assert(time > MAX_TIME);
assert(r == -1);
assert(JS_HasException(ctx));
JSValue e = JS_GetException(ctx);
expect(JS_IsUncatchableError(ctx, e));
assert(JS_IsUncatchableError(ctx, e));
JS_FreeValue(ctx, e);
JS_FreeContext(ctx);
JS_FreeRuntime(rt);
}

static JSValue save_value(JSContext *ctx, JSValue this_val, int argc, JSValue *argv)
{
expect(argc == 1);
assert(argc == 1);
JSValue *p = (JSValue *)JS_GetContextOpaque(ctx);
*p = JS_DupValue(ctx, argv[0]);
return JS_UNDEFINED;
Expand Down Expand Up @@ -109,26 +104,54 @@ static void async_call_stack_overflow(void)
JS_SetPropertyStr(ctx, global, "save_value", JS_NewCFunction(ctx, save_value, "save_value", 1));
JS_FreeValue(ctx, global);
JSValue ret = JS_Eval(ctx, code, strlen(code), "<input>", JS_EVAL_TYPE_GLOBAL);
expect(!JS_IsException(ret));
assert(!JS_IsException(ret));
JS_FreeValue(ctx, ret);
expect(JS_IsJobPending(rt));
assert(JS_IsJobPending(rt));
int r = 0;
while (JS_IsJobPending(rt)) {
r = JS_ExecutePendingJob(rt, &ctx);
}
expect(r == 1);
expect(!JS_HasException(ctx));
expect(JS_IsError(ctx, value)); /* StackOverflow should be caught */
assert(r == 1);
assert(!JS_HasException(ctx));
assert(JS_IsError(ctx, value)); // stack overflow should be caught
JS_FreeValue(ctx, value);
JS_FreeContext(ctx);
JS_FreeRuntime(rt);
}

int main()
// https://github.com/quickjs-ng/quickjs/issues/914
static void raw_context_global_var(void)
{
JSRuntime *rt = JS_NewRuntime();
JSContext *ctx = JS_NewContextRaw(rt);
JS_AddIntrinsicEval(ctx);
{
static const char code[] = "globalThis";
JSValue ret = JS_Eval(ctx, code, strlen(code), "*", JS_EVAL_TYPE_GLOBAL);
assert(JS_IsException(ret));
JS_FreeValue(ctx, ret);
}
{
static const char code[] = "var x = 42";
JSValue ret = JS_Eval(ctx, code, strlen(code), "*", JS_EVAL_TYPE_GLOBAL);
assert(JS_IsUndefined(ret));
JS_FreeValue(ctx, ret);
}
{
static const char code[] = "function f() {}";
JSValue ret = JS_Eval(ctx, code, strlen(code), "*", JS_EVAL_TYPE_GLOBAL);
assert(JS_IsUndefined(ret));
JS_FreeValue(ctx, ret);
}
JS_FreeContext(ctx);
JS_FreeRuntime(rt);
}

int main(void)
{
sync_call();
async_call();
async_call_stack_overflow();
printf("interrupt-test passed\n");
raw_context_global_var();
return 0;
}
}
5 changes: 2 additions & 3 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51399,6 +51399,8 @@ static void JS_AddIntrinsicBasicObjects(JSContext *ctx)
int i;

ctx->class_proto[JS_CLASS_OBJECT] = JS_NewObjectProto(ctx, JS_NULL);
ctx->global_obj = JS_NewObject(ctx);
ctx->global_var_obj = JS_NewObjectProto(ctx, JS_NULL);
ctx->function_proto = JS_NewCFunction3(ctx, js_function_proto, "", 0,
JS_CFUNC_generic, 0,
ctx->class_proto[JS_CLASS_OBJECT]);
Expand Down Expand Up @@ -51458,9 +51460,6 @@ void JS_AddIntrinsicBaseObjects(JSContext *ctx)
JS_FreeValue(ctx, obj1);
JS_FreeValue(ctx, js_object_seal(ctx, JS_UNDEFINED, 1, &ctx->throw_type_error, 1));

ctx->global_obj = JS_NewObject(ctx);
ctx->global_var_obj = JS_NewObjectProto(ctx, JS_NULL);

/* Object */
obj = JS_NewGlobalCConstructor(ctx, "Object", js_object_constructor, 1,
ctx->class_proto[JS_CLASS_OBJECT]);
Expand Down