aboutsummaryrefslogtreecommitdiff
path: root/nginx/ngx_js.c
diff options
context:
space:
mode:
authorDmitry Volyntsev <xeioex@nginx.com>2024-05-17 21:54:50 -0700
committerDmitry Volyntsev <xeioex@nginx.com>2024-05-17 21:54:50 -0700
commit5730d5ffe23a4965c001d873695d22005fcfa588 (patch)
tree385cac68617efbf90e073c7c82fb78f59bce385e /nginx/ngx_js.c
parentde552ba66e2851cbe57f32f7c47a38460290a6d5 (diff)
downloadnjs-5730d5ffe23a4965c001d873695d22005fcfa588.tar.gz
njs-5730d5ffe23a4965c001d873695d22005fcfa588.zip
Change: removed byte strings API.
These functions are unsafe because they produce byte strings. Byte strings may not work as expected with the existing JS methods. The following functions were removed: - njs_vm_value_string_set() use njs_vm_value_string_create() as a drop-in replacement. - njs_vm_value_string_alloc() use njs_chb_t and njs_vm_value_string_create_chb() instead. This fixes #710 on Github.
Diffstat (limited to 'nginx/ngx_js.c')
-rw-r--r--nginx/ngx_js.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/nginx/ngx_js.c b/nginx/ngx_js.c
index d1719951..aa5e71cc 100644
--- a/nginx/ngx_js.c
+++ b/nginx/ngx_js.c
@@ -668,7 +668,7 @@ ngx_js_ext_string(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value,
field = (ngx_str_t *) (p + njs_vm_prop_magic32(prop));
- return njs_vm_value_string_set(vm, retval, field->data, field->len);
+ return njs_vm_value_string_create(vm, retval, field->data, field->len);
}
@@ -745,15 +745,15 @@ njs_int_t
ngx_js_ext_build(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value,
njs_value_t *setval, njs_value_t *retval)
{
- return njs_vm_value_string_set(vm, retval,
+ return njs_vm_value_string_create(vm, retval,
#ifdef NGX_BUILD
- (u_char *) NGX_BUILD,
- njs_strlen(NGX_BUILD)
+ (u_char *) NGX_BUILD,
+ njs_strlen(NGX_BUILD)
#else
- (u_char *) "",
- 0
+ (u_char *) "",
+ 0
#endif
- );
+ );
}
@@ -761,8 +761,8 @@ njs_int_t
ngx_js_ext_conf_file_path(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
{
- return njs_vm_value_string_set(vm, retval, ngx_cycle->conf_file.data,
- ngx_cycle->conf_file.len);
+ return njs_vm_value_string_create(vm, retval, ngx_cycle->conf_file.data,
+ ngx_cycle->conf_file.len);
}
@@ -770,8 +770,8 @@ njs_int_t
ngx_js_ext_conf_prefix(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
{
- return njs_vm_value_string_set(vm, retval, ngx_cycle->conf_prefix.data,
- ngx_cycle->conf_prefix.len);
+ return njs_vm_value_string_create(vm, retval, ngx_cycle->conf_prefix.data,
+ ngx_cycle->conf_prefix.len);
}
@@ -779,8 +779,8 @@ njs_int_t
ngx_js_ext_error_log_path(njs_vm_t *vm, njs_object_prop_t *prop,
njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
{
- return njs_vm_value_string_set(vm, retval, ngx_cycle->error_log.data,
- ngx_cycle->error_log.len);
+ return njs_vm_value_string_create(vm, retval, ngx_cycle->error_log.data,
+ ngx_cycle->error_log.len);
}
@@ -788,8 +788,8 @@ njs_int_t
ngx_js_ext_prefix(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value,
njs_value_t *setval, njs_value_t *retval)
{
- return njs_vm_value_string_set(vm, retval, ngx_cycle->prefix.data,
- ngx_cycle->prefix.len);
+ return njs_vm_value_string_create(vm, retval, ngx_cycle->prefix.data,
+ ngx_cycle->prefix.len);
}
@@ -797,8 +797,8 @@ njs_int_t
ngx_js_ext_version(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value,
njs_value_t *setval, njs_value_t *retval)
{
- return njs_vm_value_string_set(vm, retval, (u_char *) NGINX_VERSION,
- njs_strlen(NGINX_VERSION));
+ return njs_vm_value_string_create(vm, retval, (u_char *) NGINX_VERSION,
+ njs_strlen(NGINX_VERSION));
}