From: Dmitry Volyntsev Date: Fri, 13 Nov 2026 02:25:11 +0000 (-0800) Subject: QuickJS: fix zero-length allocations with QuickJS-NG X-Git-Url: https://git.kaiwu.me/%7Bsubstring-before(@doc,%20'.xml')%7D.html?a=commitdiff_plain;h=0a315376890db185566bb40b34cfb655ea143893;p=njs.git QuickJS: fix zero-length allocations with QuickJS-NG QuickJS-NG js_malloc() returns NULL and throws "out of memory" for a zero size, while QuickJS returns a valid pointer. Empty inputs to hash update() and fs write and read functions with a string encoding, empty raw and JWK secret keys in WebCrypto importKey() and zero-length deriveBits() failed with an out of memory error. Since QuickJS-NG 0.18.0 (90aa2c4) that error is uncatchable, so such a call terminates the script. Now at least one byte is allocated, as QuickJS-NG itself does for possibly empty allocations. --- diff --git a/external/qjs_crypto_module.c b/external/qjs_crypto_module.c index 51534d2a..d65b14ab 100644 --- a/external/qjs_crypto_module.c +++ b/external/qjs_crypto_module.c @@ -208,7 +208,7 @@ qjs_hash_prototype_update(JSContext *cx, JSValueConst this_val, int argc, if (enc->decode_length != NULL) { content.length = enc->decode_length(cx, &str); - content.start = js_malloc(cx, content.length); + content.start = js_malloc(cx, njs_max(content.length, 1)); if (content.start == NULL) { JS_FreeCString(cx, (const char *) str.start); return JS_ThrowOutOfMemory(cx); diff --git a/external/qjs_fs_module.c b/external/qjs_fs_module.c index cad376cd..39ea873b 100644 --- a/external/qjs_fs_module.c +++ b/external/qjs_fs_module.c @@ -2002,7 +2002,7 @@ qjs_fs_write(JSContext *cx, JSValueConst this_val, int argc, if (encoding->decode_length != NULL) { content.length = encoding->decode_length(cx, &str); - content.start = js_malloc(cx, content.length); + content.start = js_malloc(cx, njs_max(content.length, 1)); if (content.start == NULL) { JS_FreeCString(cx, (const char *) str.start); JS_ThrowOutOfMemory(cx); @@ -2237,7 +2237,7 @@ decode: if (encoding->decode_length != NULL) { content.length = encoding->decode_length(cx, &str); - content.start = js_malloc(cx, content.length); + content.start = js_malloc(cx, njs_max(content.length, 1)); if (content.start == NULL) { JS_FreeCString(cx, (const char *) str.start); JS_ThrowOutOfMemory(cx); @@ -2871,7 +2871,7 @@ qjs_fs_encode(JSContext *cx, const qjs_buffer_encoding_t *encoding, } else if (encoding->encode_length != NULL) { data.length = encoding->encode_length(cx, str); - data.start = js_malloc(cx, data.length); + data.start = js_malloc(cx, njs_max(data.length, 1)); if (data.start == NULL) { JS_ThrowOutOfMemory(cx); return JS_EXCEPTION; diff --git a/external/qjs_webcrypto_module.c b/external/qjs_webcrypto_module.c index adfe3535..5defe8c9 100644 --- a/external/qjs_webcrypto_module.c +++ b/external/qjs_webcrypto_module.c @@ -2270,7 +2270,7 @@ qjs_webcrypto_derive(JSContext *cx, JSValueConst this_val, int argc, dkey = JS_GetOpaque(dkey_value, QJS_CORE_CLASS_ID_WEBCRYPTO_KEY); } - k = js_malloc(cx, length); + k = js_malloc(cx, njs_max(length, 1)); if (k == NULL) { JS_ThrowOutOfMemory(cx); return JS_EXCEPTION; @@ -3786,7 +3786,7 @@ qjs_import_jwk_oct(JSContext *cx, JSValue jwk, qjs_webcrypto_key_t *key) size = qjs_base64url_decode_length(cx, &b64); key->u.s.raw.length = size; - key->u.s.raw.start = js_malloc(cx, size); + key->u.s.raw.start = js_malloc(cx, njs_max(size, 1)); if (key->u.s.raw.start == NULL) { JS_FreeCString(cx, (char *) b64.start); JS_ThrowOutOfMemory(cx); @@ -4271,7 +4271,7 @@ qjs_webcrypto_import_key_internal(JSContext *cx, qjs_webcrypto_key_format_t fmt, goto fail; } - wkey->u.s.raw.start = js_malloc(cx, kd.length); + wkey->u.s.raw.start = js_malloc(cx, njs_max(kd.length, 1)); if (wkey->u.s.raw.start == NULL) { JS_ThrowOutOfMemory(cx); goto fail; @@ -4327,7 +4327,7 @@ qjs_webcrypto_import_key_internal(JSContext *cx, qjs_webcrypto_key_format_t fmt, case QJS_ALGORITHM_PBKDF2: case QJS_ALGORITHM_HKDF: default: - wkey->u.s.raw.start = js_malloc(cx, kd.length); + wkey->u.s.raw.start = js_malloc(cx, njs_max(kd.length, 1)); if (wkey->u.s.raw.start == NULL) { JS_ThrowOutOfMemory(cx); goto fail;