Skip to content

Commit ad277aa

Browse files
committed
Merge remote-tracking branch 'origin/main' into update
2 parents 7450a7e + 425a4bc commit ad277aa

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

test/test_core.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10080,6 +10080,11 @@ def setUp(self):
1008010080
# This setup will still use the native x64 Node.js in Emscripten internal use to compile code, but
1008110081
# runs all unit tests via qemu on the s390x big endian version of Node.js.
1008210082
bigendian0 = make_run('bigendian0', cflags=['-O0', '-Wno-experimental'], settings={'SUPPORT_BIG_ENDIAN': 1})
10083+
bigendian1 = make_run('bigendian1', cflags=['-O1', '-Wno-experimental'], settings={'SUPPORT_BIG_ENDIAN': 1})
10084+
bigendian2 = make_run('bigendian2', cflags=['-O2', '-Wno-experimental'], settings={'SUPPORT_BIG_ENDIAN': 1})
10085+
bigendian3 = make_run('bigendian3', cflags=['-O3', '-Wno-experimental'], settings={'SUPPORT_BIG_ENDIAN': 1})
10086+
bigendians = make_run('bigendians', cflags=['-Os', '-Wno-experimental'], settings={'SUPPORT_BIG_ENDIAN': 1})
10087+
bigendianz = make_run('bigendianz', cflags=['-Oz', '-Wno-experimental'], settings={'SUPPORT_BIG_ENDIAN': 1})
1008310088

1008410089
omitexports0 = make_run('omitexports0', cflags=['-O0'], settings={'DECLARE_ASM_MODULE_EXPORTS': 0})
1008510090

tools/websocket_to_posix_proxy/src/websocket_to_posix_proxy.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,6 +1494,7 @@ void Getaddrinfo(int client_fd, uint8_t *data, uint64_t numBytes) {
14941494
r->ret = ret;
14951495
r->errno_ = errorCode;
14961496
strncpy(r->ai_canonname, ai_canonname, MAX_NODE_LEN-1);
1497+
r->ai_canonname[MAX_NODE_LEN-1] = 0; // Null terminate output string if it truncated.
14971498
r->addrCount = addrCount;
14981499

14991500
struct addrinfo *ai = res;

0 commit comments

Comments
 (0)