-
-
Save xeioex/8d728c83284a3a76746153a661124778 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/njs_builtin.c b/src/njs_builtin.c | |
| index e1ab0e97..5ce2ec7e 100644 | |
| --- a/src/njs_builtin.c | |
| +++ b/src/njs_builtin.c | |
| @@ -1345,7 +1345,6 @@ njs_process_object_env(njs_vm_t *vm, njs_object_prop_t *pr, uint32_t unused, | |
| ret = njs_flathsh_unique_insert(njs_object_hash(process), &lhq); | |
| if (njs_slow_path(ret != NJS_OK)) { | |
| njs_internal_error(vm, "lvlhsh insert failed"); | |
| - | |
| return NJS_ERROR; | |
| } | |
| diff --git a/src/njs_object.c b/src/njs_object.c | |
| index 0e88c621..0c592176 100644 | |
| --- a/src/njs_object.c | |
| +++ b/src/njs_object.c | |
| @@ -1375,6 +1375,7 @@ njs_object_make_shared(njs_vm_t *vm, njs_object_t *object) | |
| obj_prop->configurable = prop->configurable; | |
| obj_prop->writable = prop->writable; | |
| obj_prop->u.value = prop->u.value; | |
| + | |
| njs_value_assign(&value, njs_prop_value(prop)); | |
| if (njs_is_object(&value) | |
| @@ -1728,7 +1729,6 @@ njs_object_get_own_property_descriptors(njs_vm_t *vm, njs_value_t *args, | |
| prop->writable = 1; | |
| prop->u.value = descriptor; | |
| - | |
| } | |
| ret = NJS_OK; | |
| @@ -2468,7 +2468,6 @@ njs_property_constructor_set(njs_vm_t *vm, njs_flathsh_t *hash, | |
| prop->enumerable = 0; | |
| prop->configurable = 1; | |
| prop->writable = 1; | |
| - | |
| prop->u.value = *constructor; | |
| return njs_prop_value(prop); | |
| diff --git a/src/njs_object_prop.c b/src/njs_object_prop.c | |
| index 1b2efdef..6b93960c 100644 | |
| --- a/src/njs_object_prop.c | |
| +++ b/src/njs_object_prop.c | |
| @@ -791,7 +791,7 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, | |
| { | |
| njs_int_t ret; | |
| njs_object_t *desc; | |
| - njs_object_prop_t *prop, *pr; | |
| + njs_object_prop_t *pr, *prop; | |
| const njs_value_t *setval; | |
| njs_flathsh_query_t lhq; | |
| njs_property_query_t pq; | |
| @@ -854,7 +854,6 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, | |
| lhq.pool = vm->mem_pool; | |
| if (njs_is_data_descriptor(prop)) { | |
| - | |
| lhq.key_hash = NJS_ATOM_STRING_value; | |
| ret = njs_flathsh_unique_insert(&desc->hash, &lhq); | |
| @@ -889,7 +888,6 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, | |
| pr->writable = 1; | |
| pr->u.value = *setval; | |
| - | |
| } else { | |
| lhq.key_hash = NJS_ATOM_STRING_get; | |
| @@ -912,7 +910,6 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, | |
| njs_set_function(njs_prop_value(pr), njs_prop_getter(prop)); | |
| } | |
| - | |
| lhq.key_hash = NJS_ATOM_STRING_set; | |
| ret = njs_flathsh_unique_insert(&desc->hash, &lhq); | |
| @@ -932,7 +929,6 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, | |
| if (njs_prop_setter(prop) != NULL) { | |
| njs_set_function(njs_prop_value(pr), njs_prop_setter(prop)); | |
| } | |
| - | |
| } | |
| lhq.key_hash = NJS_ATOM_STRING_enumerable; | |
| @@ -953,7 +949,6 @@ njs_object_prop_descriptor(njs_vm_t *vm, njs_value_t *dest, | |
| pr->writable = 1; | |
| pr->u.value = *setval; | |
| - | |
| lhq.key_hash = NJS_ATOM_STRING_configurable; | |
| setval = (prop->configurable == 1) ? &njs_value_true : &njs_value_false; | |
| @@ -1044,7 +1039,7 @@ njs_object_props_init(njs_vm_t *vm, const njs_object_init_t* init, | |
| prop->type = NJS_PROPERTY; | |
| njs_set_object(njs_prop_value(prop), object); | |
| - | |
| njs_value_assign(retval, njs_prop_value(prop)); | |
| + | |
| return NJS_OK; | |
| } | |
| diff --git a/src/njs_scope.c b/src/njs_scope.c | |
| index 10ac9aff..7959849a 100644 | |
| --- a/src/njs_scope.c | |
| +++ b/src/njs_scope.c | |
| @@ -240,7 +240,6 @@ njs_scope_value_index(njs_vm_t *vm, const njs_value_t *src, njs_uint_t runtime, | |
| pr = lhq.value; | |
| pr->u.val = value; | |
| - | |
| } | |
| if (start != (u_char *) src) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment