Skip to content
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

Jump to bottom

Call ReleaseByteArrayElements even when handling of socket_path fails… #13435

Merged
merged 1 commit into from Jun 13, 2023
Merged

Call ReleaseByteArrayElements even when handling of socket_path fails… #13435

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions transport-native-unix-common/src/main/c/netty_unix_socket.c
View file
Open in desktop
Expand Up @@ -843,16 +843,17 @@ static jint netty_unix_socket_bindDomainSocket(JNIEnv* env, jclass clazz, jint f
jint socket_path_len = (*env)->GetArrayLength(env, socketPath);

if (socket_path_len > sizeof(addr.sun_path) || (socket_path_len == sizeof(addr.sun_path) && socket_path[socket_path_len] != '\0')) {
(*env)->ReleaseByteArrayElements(env, socketPath, socket_path, 0);
return -ENAMETOOLONG;
}
memcpy(addr.sun_path, socket_path, socket_path_len);
(*env)->ReleaseByteArrayElements(env, socketPath, socket_path, 0);

if (unlink((const char*) addr.sun_path) == -1 && errno != ENOENT) {
return -errno;
}

int res = bind(fd, (struct sockaddr*) &addr, _UNIX_ADDR_LENGTH(socket_path_len));
(*env)->ReleaseByteArrayElements(env, socketPath, socket_path, 0);

if (res == -1) {
return -errno;
Expand All @@ -871,18 +872,18 @@ static jint netty_unix_socket_connectDomainSocket(JNIEnv* env, jclass clazz, jin
socket_path_len = (*env)->GetArrayLength(env, socketPath);

if (socket_path_len > sizeof(addr.sun_path) || (socket_path_len == sizeof(addr.sun_path) && socket_path[socket_path_len] != '\0')) {
(*env)->ReleaseByteArrayElements(env, socketPath, socket_path, 0);
return -ENAMETOOLONG;
}
memcpy(addr.sun_path, socket_path, socket_path_len);
(*env)->ReleaseByteArrayElements(env, socketPath, socket_path, 0);

int res;
int err;
do {
res = connect(fd, (struct sockaddr*) &addr, _UNIX_ADDR_LENGTH(socket_path_len));
} while (res == -1 && ((err = errno) == EINTR));

(*env)->ReleaseByteArrayElements(env, socketPath, socket_path, 0);

if (res < 0) {
return -err;
}
Expand Down