Skip to content

Fixed build with gcc-15 and -O3. #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xeioex merged 1 commit into from
Sep 17, 2025
Merged

Fixed build with gcc-15 and -O3. #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/njs_array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,6 @@ static njs_int_t
njs_array_prototype_slice_copy(njs_vm_t *vm, njs_value_t *this,
int64_t start, int64_t length, njs_value_t *retval)
{
u_char *c, buf[4];
size_t size;
uint32_t n;
njs_int_t ret;
Expand Down Expand Up @@ -829,17 +828,15 @@ njs_array_prototype_slice_copy(njs_vm_t *vm, njs_value_t *this,

do {
value = &array->start[n++];
c = buf;
c = njs_utf8_copy(c, &src, end);
size = c - buf;
size = njs_utf8_next(src, end) - src;

ret = njs_string_new(vm, value, buf, size, 1);
ret = njs_string_new(vm, value, src, size, 1);
if (njs_slow_path(ret != NJS_OK)) {
return NJS_ERROR;
}

length--;
} while (length != 0);
src += size;
} while (src != end);

} else if (njs_is_object(this)) {

Expand Down
17 changes: 6 additions & 11 deletions src/njs_object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,6 @@ static njs_int_t
njs_object_enumerate_string(njs_vm_t *vm, const njs_value_t *value,
njs_array_t *items, uint32_t flags)
{
u_char buf[4], *c;
uint32_t i, len, size;
njs_int_t ret;
njs_value_t *item, *string;
Expand Down Expand Up @@ -763,17 +762,15 @@ njs_object_enumerate_string(njs_vm_t *vm, const njs_value_t *value,
end = src + str_prop.size;

do {
c = buf;
size = njs_utf8_next(src, end) - src;

c = njs_utf8_copy(c, &src, end);
size = c - buf;

ret = njs_string_new(vm, item, buf, size, 1);
ret = njs_string_new(vm, item, src, size, 1);
if (njs_slow_path(ret != NJS_OK)) {
return NJS_ERROR;
}

item++;
src += size;

} while (src != end);
}
Expand Down Expand Up @@ -828,19 +825,17 @@ njs_object_enumerate_string(njs_vm_t *vm, const njs_value_t *value,

string = &entry->start[1];

c = buf;

c = njs_utf8_copy(c, &src, end);
size = c - buf;
size = njs_utf8_next(src, end) - src;

ret = njs_string_new(vm, string, buf, size, 1);
ret = njs_string_new(vm, string, src, size, 1);
if (njs_slow_path(ret != NJS_OK)) {
return NJS_ERROR;
}

njs_set_array(item, entry);

item++;
src += size;

} while (src != end);
}
Expand Down