From: Dmitry Volyntsev Date: Tue, 17 Nov 2026 01:08:43 +0000 (-0800) Subject: WebCrypto: check string creation status in njs X-Git-Url: https://git.kaiwu.me/%7Bsubstring-before(@doc,%20'.xml')%7D.html?a=commitdiff_plain;h=07bcca192d9380b2c616c9d85701727eb0321da0;p=njs.git WebCrypto: check string creation status in njs Previously, several CryptoKey getters and JWK export helpers ignored the result of njs_vm_value_string_create(). Since b28e50b1 (0.9.0) even short strings are allocated, so an allocation failure left the value uninitialized. Reading key.algorithm then crashed in njs_vm_object_alloc(), and key.type returned success with a pending exception. Propagate the error like the other string creation calls in the module do. --- diff --git a/external/njs_webcrypto_module.c b/external/njs_webcrypto_module.c index 96bd1612..45ddb487 100644 --- a/external/njs_webcrypto_module.c +++ b/external/njs_webcrypto_module.c @@ -2266,7 +2266,11 @@ njs_export_jwk_rsa(njs_vm_t *vm, njs_webcrypto_key_t *key, njs_value_t *retval) return NJS_ERROR; } - njs_vm_value_string_create(vm, njs_value_arg(&rsa_s), (u_char *) "RSA", 3); + ret = njs_vm_value_string_create(vm, njs_value_arg(&rsa_s), + (u_char *) "RSA", 3); + if (ret != NJS_OK) { + return NJS_ERROR; + } ret = njs_vm_object_prop_set(vm, retval, &string_kty, &rsa_s); if (ret != NJS_OK) { @@ -2320,8 +2324,11 @@ njs_export_jwk_rsa(njs_vm_t *vm, njs_webcrypto_key_t *key, njs_value_t *retval) nm = &njs_webcrypto_alg_name[key->alg->type][key->hash]; - (void) njs_vm_value_string_create(vm, njs_value_arg(&alg), nm->start, - nm->length); + ret = njs_vm_value_string_create(vm, njs_value_arg(&alg), nm->start, + nm->length); + if (ret != NJS_OK) { + return NJS_ERROR; + } return njs_vm_object_prop_set(vm, retval, &string_alg, &alg); } @@ -2386,20 +2393,28 @@ njs_export_jwk_ec(njs_vm_t *vm, njs_webcrypto_key_t *key, njs_value_t *retval) nid = EC_GROUP_get_curve_name(group); cname = njs_algorithm_curve_name(nid); - (void) njs_vm_value_string_create(vm, njs_value_arg(&name), - cname->start, cname->length); if (cname->length == 0) { njs_vm_type_error(vm, "Unsupported JWK EC curve: %s", OBJ_nid2sn(nid)); goto fail; } + ret = njs_vm_value_string_create(vm, njs_value_arg(&name), cname->start, + cname->length); + if (ret != NJS_OK) { + goto fail; + } + ret = njs_vm_object_alloc(vm, retval, NULL); if (ret != NJS_OK) { goto fail; } - njs_vm_value_string_create(vm, njs_value_arg(&ec_s), (u_char *) "EC", 2); + ret = njs_vm_value_string_create(vm, njs_value_arg(&ec_s), + (u_char *) "EC", 2); + if (ret != NJS_OK) { + return NJS_ERROR; + } ret = njs_vm_object_prop_set(vm, retval, &string_kty, &ec_s); if (ret != NJS_OK) { @@ -2565,8 +2580,11 @@ njs_export_jwk_oct(njs_vm_t *vm, njs_webcrypto_key_t *key, njs_value_t *retval) if (key->alg->type == NJS_ALGORITHM_HMAC) { nm = &njs_webcrypto_alg_name[type][key->hash]; - (void) njs_vm_value_string_create(vm, njs_value_arg(&alg), nm->start, - nm->length); + ret = njs_vm_value_string_create(vm, njs_value_arg(&alg), nm->start, + nm->length); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } } else { switch (key->u.s.raw.length) { @@ -2575,8 +2593,12 @@ njs_export_jwk_oct(njs_vm_t *vm, njs_webcrypto_key_t *key, njs_value_t *retval) case 32: nm = &njs_webcrypto_alg_aes_name [type - NJS_ALGORITHM_AES_GCM][(key->u.s.raw.length - 16) / 8]; - (void) njs_vm_value_string_create(vm, njs_value_arg(&alg), - nm->start, nm->length); + ret = njs_vm_value_string_create(vm, njs_value_arg(&alg), + nm->start, nm->length); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } + break; default: @@ -2597,7 +2619,11 @@ njs_export_jwk_oct(njs_vm_t *vm, njs_webcrypto_key_t *key, njs_value_t *retval) return NJS_ERROR; } - njs_vm_value_string_create(vm, njs_value_arg(&oct_s), (u_char *) "oct", 3); + ret = njs_vm_value_string_create(vm, njs_value_arg(&oct_s), + (u_char *) "oct", 3); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } ret = njs_vm_object_prop_set(vm, retval, &string_kty, &oct_s); if (ret != NJS_OK) { @@ -5359,8 +5385,11 @@ njs_key_ext_algorithm(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t unused, return NJS_ERROR; } - (void) njs_vm_value_string_create(vm, njs_value_arg(&name_s), + ret = njs_vm_value_string_create(vm, njs_value_arg(&name_s), (u_char *) "name", njs_length("name")); + if (njs_slow_path(ret != NJS_OK)) { + return NJS_ERROR; + } ret = njs_vm_object_alloc(vm, retval, &name_s, &alg, NULL); if (njs_slow_path(ret != NJS_OK)) { @@ -5528,15 +5557,14 @@ njs_key_ext_type(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t unused, } if (key->alg->raw) { - (void) njs_vm_value_string_create(vm, retval, (u_char *) "secret", + return njs_vm_value_string_create(vm, retval, (u_char *) "secret", njs_length("secret")); - } else { - type = key->u.a.privat ? "private": "public"; - (void) njs_vm_value_string_create(vm, retval, (u_char *) type, - key->u.a.privat ? 7 : 6); } - return NJS_OK; + type = key->u.a.privat ? "private": "public"; + + return njs_vm_value_string_create(vm, retval, (u_char *) type, + key->u.a.privat ? 7 : 6); }