admin/Suwayomi-Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

catch_abort: Remove java interop & catch SIGILL (#1891)

Browse Source 
* catch_abort: Remove java interop

It won't work anyway since we're exiting the thread immediately

* catch_abort: Also catch SIGILL
This commit is contained in:
Constantin Piber
2026-02-08 21:05:06 +01:00
committed by GitHub
parent 5b5e2b26f9
commit d8a5cdfb78
2 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/bundler.sh
+1 -1
View File
@@ -39,7 +39,7 @@ main() {
download_launcher download_launcher
if [ ! -f scripts/resources/catch_abort.so ]; then if [ ! -f scripts/resources/catch_abort.so ]; then
gcc -fPIC -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -shared scripts/resources/catch_abort.c -lpthread -o scripts/resources/catch_abort.so gcc -fPIC -shared scripts/resources/catch_abort.c -lpthread -o scripts/resources/catch_abort.so
fi fi
JRE_ZULU="25.30.17_25.0.1" JRE_ZULU="25.30.17_25.0.1"
scripts/resources/catch_abort.c
+4 -34
View File
@@ -1,52 +1,19 @@
// Linux only: // Linux only:
// Attempts to catch SIGTRAP, inform Java, then exit the thread instead of bringing down the whole process // Attempts to catch SIGTRAP and exit the thread instead of bringing down the whole process
#define _GNU_SOURCE #define _GNU_SOURCE
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <signal.h> #include <signal.h>
#include <pthread.h> #include <pthread.h>
#include <execinfo.h> #include <execinfo.h>
#include <jni.h>
JavaVM *g_vm;
void load_vm() {
if (g_vm) return;
JavaVM *vms[1];
jsize n = 0;
// JNI_OnLoad won't be called when loaded via LD_PRELOAD, so attempt to find the VM now
if (JNI_GetCreatedJavaVMs(vms, 1, &n) == JNI_OK && n > 0) {
g_vm = vms[0];
}
}
jint throwThreadDeath(JNIEnv *env, char *message) {
char *className = "java/lang/UnknownError";
jclass exClass = (*env)->FindClass(env, className);
if (exClass == NULL) return JNI_ERR;
return (*env)->ThrowNew(env, exClass, message);
}
void signalHandler(int signum, siginfo_t* si, void* uc) { void signalHandler(int signum, siginfo_t* si, void* uc) {
void *retaddrs[64]; void *retaddrs[64];
int n = backtrace(retaddrs, sizeof(retaddrs) / sizeof(retaddrs[0])); int n = backtrace(retaddrs, sizeof(retaddrs) / sizeof(retaddrs[0]));
printf("\n### ABORT :: Backtrace: ###\n"); printf("\n### ABORT :: Backtrace: ###\n");
backtrace_symbols_fd(retaddrs, n, STDERR_FILENO); backtrace_symbols_fd(retaddrs, n, STDERR_FILENO);
printf("### ABORT :: Exiting this thread. If this causes problems, please report the above backtrace to Suwayomi. ###\n\n"); printf("### ABORT :: Exiting this thread. If this causes problems, please report the above backtrace to Suwayomi. ###\n\n");
load_vm();
if (g_vm) {
JNIEnv *env;
jint getEnvStat = (*g_vm)->GetEnv(g_vm, (void**) &env, JNI_VERSION_1_2);
if (getEnvStat == JNI_EDETACHED) (*g_vm)->AttachCurrentThread(g_vm, (void**) &env, NULL);
jint exStat = throwThreadDeath(env, "SIGTRAP caught");
if (exStat != 0) printf("Exception throwing failed: %d\n", exStat);
(*g_vm)->DetachCurrentThread(g_vm);
}
pthread_exit(NULL); pthread_exit(NULL);
} }
@@ -59,4 +26,7 @@ void dlmain() {
if (sigaction(SIGTRAP, &sa, NULL) != 0) { if (sigaction(SIGTRAP, &sa, NULL) != 0) {
printf("[FATAL] sigaction failed\n"); printf("[FATAL] sigaction failed\n");
} }
if (sigaction(SIGILL, &sa, NULL) != 0) {
printf("[FATAL] sigaction failed\n");
}
} }