Skip to content

Fixed: Fix SIGKILL, am socket result frame and socket fd bugs in termux-shared #5246

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

Open
BuildWithAni wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed: Fix SIGKILL, am socket result frame and socket fd bugs in termux-shared #5246

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
2 changes: 1 addition & 1 deletion termux-shared/src/main/java/com/termux/shared/net/socket/local/LocalClientSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public Error available(MutableInt available, boolean checkDeadline) {
return null;
}

JniResult result = LocalSocketManager.available(mLocalSocketRunConfig.getLogTitle() + " (client)", mLocalSocketRunConfig.getFD());
JniResult result = LocalSocketManager.available(mLocalSocketRunConfig.getLogTitle() + " (client)", mFD);
if (result == null || result.retval != 0) {
return LocalSocketErrno.ERRNO_CHECK_AVAILABLE_DATA_ON_CLIENT_SOCKET_FAILED.getError(
mLocalSocketRunConfig.getTitle(), JniResult.getErrorString(result));
Expand Down
1 change: 1 addition & 0 deletions termux-shared/src/main/java/com/termux/shared/shell/am/AmSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ public static void processAmClient(@NonNull LocalSocketManager localSocketManage
if (error != null) {
sendResultToClient(localSocketManager, clientSocket, 1, stdout.toString(),
!stderr.toString().isEmpty() ? stderr + "\n\n" + error : error.toString());
return;
}

sendResultToClient(localSocketManager, clientSocket, 0, stdout.toString(), stderr.toString());
Expand Down
6 changes: 3 additions & 3 deletions termux-shared/src/main/java/com/termux/shared/shell/command/runner/app/AppShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ public void killIfExecuting(@NonNull final Context context, boolean processResul
}
}

if (mExecutionCommand.isExecuting()) {
kill();
}
// Send SIGKILL to process unconditionally since setStateFailed() sets state to FAILED and
// isExecuting() will always be false after that
kill();
}

/**
Expand Down