mirrors/quickjs
1
0
Fork 0
mirror of https://github.com/bellard/quickjs.git synced 2024-11-22 21:58:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling

Browse Source 
- detect and report invalid duplicate parameter names
- throw RangeError for too many function arguments
- throw RangeError for invalid string length
- prevent `-Wcast-function-type` warnings
This commit is contained in:
Charlie Gordon 2024-03-23 12:58:53 +01:00
parent 203fe2d539
commit 653b2276cb
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
quickjs.c
View File

@ -33946,6 +33946,8 @@ static __exception int js_parse_function_decl2(JSParseState *s,
goto fail; goto fail;
} }
if (fd->has_parameter_expressions) { if (fd->has_parameter_expressions) {
if (js_parse_check_duplicate_parameter(s, name))
goto fail;
if (define_var(s, fd, name, JS_VAR_DEF_LET) < 0) if (define_var(s, fd, name, JS_VAR_DEF_LET) < 0)
goto fail; goto fail;
} }
@ -38455,7 +38457,9 @@ static JSValue *build_arg_list(JSContext *ctx, uint32_t *plen,
if (js_get_length32(ctx, &len, array_arg)) if (js_get_length32(ctx, &len, array_arg))
return NULL; return NULL;
if (len > JS_MAX_LOCAL_VARS) { if (len > JS_MAX_LOCAL_VARS) {
JS_ThrowInternalError(ctx, "too many arguments"); // XXX: check for stack overflow?
JS_ThrowRangeError(ctx, "too many arguments in function call (only %d allowed)",
JS_MAX_LOCAL_VARS);
return NULL; return NULL;
} }
/* avoid allocating 0 bytes */ /* avoid allocating 0 bytes */
@ -39219,7 +39223,7 @@ static JSValue js_array_with(JSContext *ctx, JSValueConst this_val,
idx = len + idx; idx = len + idx;
if (idx < 0 || idx >= len) { if (idx < 0 || idx >= len) {
JS_ThrowRangeError(ctx, "out of bound"); JS_ThrowRangeError(ctx, "invalid array index: %" PRId64, idx);
goto exception; goto exception;
} }
@ -41840,7 +41844,7 @@ static JSValue js_string_includes(JSContext *ctx, JSValueConst this_val,
ret = js_is_regexp(ctx, argv[0]); ret = js_is_regexp(ctx, argv[0]);
if (ret) { if (ret) {
if (ret > 0) if (ret > 0)
JS_ThrowTypeError(ctx, "regex not supported"); JS_ThrowTypeError(ctx, "regexp not supported");
goto fail; goto fail;
} }
v = JS_ToString(ctx, argv[0]); v = JS_ToString(ctx, argv[0]);
@ -42402,7 +42406,7 @@ static JSValue js_string_pad(JSContext *ctx, JSValueConst this_val,
} }
} }
if (n > JS_STRING_LEN_MAX) { if (n > JS_STRING_LEN_MAX) {
JS_ThrowInternalError(ctx, "string too long"); JS_ThrowRangeError(ctx, "invalid string length");
goto fail2; goto fail2;
} }
if (string_buffer_init(ctx, b, n)) if (string_buffer_init(ctx, b, n))
@ -42464,8 +42468,9 @@ static JSValue js_string_repeat(JSContext *ctx, JSValueConst this_val,
len = p->len; len = p->len;
if (len == 0 || n == 1) if (len == 0 || n == 1)
return str; return str;
// XXX: potential arithmetic overflow
if (val * len > JS_STRING_LEN_MAX) { if (val * len > JS_STRING_LEN_MAX) {
JS_ThrowInternalError(ctx, "string too long"); JS_ThrowRangeError(ctx, "invalid string length");
goto fail; goto fail;
} }
if (string_buffer_init2(ctx, b, n * len, p->is_wide_char)) if (string_buffer_init2(ctx, b, n * len, p->is_wide_char))
@ -52728,11 +52733,13 @@ void JS_AddIntrinsicBaseObjects(JSContext *ctx)
JS_NewGlobalCConstructor2(ctx, obj1, JS_NewGlobalCConstructor2(ctx, obj1,
"Error", ctx->class_proto[JS_CLASS_ERROR]); "Error", ctx->class_proto[JS_CLASS_ERROR]);
/* Used to squelch a -Wcast-function-type warning. */
JSCFunctionType ft = { .generic_magic = js_error_constructor };
for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) { for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
JSValue func_obj; JSValue func_obj;
int n_args; int n_args;
n_args = 1 + (i == JS_AGGREGATE_ERROR); n_args = 1 + (i == JS_AGGREGATE_ERROR);
func_obj = JS_NewCFunction3(ctx, (JSCFunction *)js_error_constructor, func_obj = JS_NewCFunction3(ctx, ft.generic,
native_error_name[i], n_args, native_error_name[i], n_args,
JS_CFUNC_constructor_or_func_magic, i, obj1); JS_CFUNC_constructor_or_func_magic, i, obj1);
JS_NewGlobalCConstructor2(ctx, func_obj, native_error_name[i], JS_NewGlobalCConstructor2(ctx, func_obj, native_error_name[i],
@ -53518,7 +53525,7 @@ static JSValue js_typed_array_with(JSContext *ctx, JSValueConst this_val,
if (idx < 0) if (idx < 0)
idx = len + idx; idx = len + idx;
if (idx < 0 || idx >= len) if (idx < 0 || idx >= len)
return JS_ThrowRangeError(ctx, "out of bound"); return JS_ThrowRangeError(ctx, "invalid array index");
val = JS_ToPrimitive(ctx, argv[1], HINT_NUMBER); val = JS_ToPrimitive(ctx, argv[1], HINT_NUMBER);
if (JS_IsException(val)) if (JS_IsException(val))
@ -55855,6 +55862,8 @@ void JS_AddIntrinsicTypedArrays(JSContext *ctx)
countof(js_typed_array_base_funcs)); countof(js_typed_array_base_funcs));
JS_SetConstructor(ctx, typed_array_base_func, typed_array_base_proto); JS_SetConstructor(ctx, typed_array_base_func, typed_array_base_proto);
/* Used to squelch a -Wcast-function-type warning. */
JSCFunctionType ft = { .generic_magic = js_typed_array_constructor };
for(i = JS_CLASS_UINT8C_ARRAY; i < JS_CLASS_UINT8C_ARRAY + JS_TYPED_ARRAY_COUNT; i++) { for(i = JS_CLASS_UINT8C_ARRAY; i < JS_CLASS_UINT8C_ARRAY + JS_TYPED_ARRAY_COUNT; i++) {
JSValue func_obj; JSValue func_obj;
char buf[ATOM_GET_STR_BUF_SIZE]; char buf[ATOM_GET_STR_BUF_SIZE];
@ -55867,7 +55876,7 @@ void JS_AddIntrinsicTypedArrays(JSContext *ctx)
0); 0);
name = JS_AtomGetStr(ctx, buf, sizeof(buf), name = JS_AtomGetStr(ctx, buf, sizeof(buf),
JS_ATOM_Uint8ClampedArray + i - JS_CLASS_UINT8C_ARRAY); JS_ATOM_Uint8ClampedArray + i - JS_CLASS_UINT8C_ARRAY);
func_obj = JS_NewCFunction3(ctx, (JSCFunction *)js_typed_array_constructor, func_obj = JS_NewCFunction3(ctx, ft.generic,
name, 3, JS_CFUNC_constructor_magic, i, name, 3, JS_CFUNC_constructor_magic, i,
typed_array_base_func); typed_array_base_func);
JS_NewGlobalCConstructor2(ctx, func_obj, name, ctx->class_proto[i]); JS_NewGlobalCConstructor2(ctx, func_obj, name, ctx->class_proto[i]);