manawenuz/wz-phone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove panic::catch_unwind from nativeStartSignaling — stack overflow on Android
Some checks failed
Mirror to GitHub / mirror (push) Failing after 42s
Details
Build Release Binaries / build-amd64 (push) Failing after 3m28s
Details

Browse Source
This commit is contained in:
Siavash Sameni
2026-04-09 08:04:47 +04:00
parent fe9ae276dc
commit faec332a8c
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
crates/wzp-android/src/jni_bridge.rs
View File

@@ -364,6 +364,8 @@ pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativePingRelay<'a>(
/// Start persistent signaling connection to relay for direct calls. /// Start persistent signaling connection to relay for direct calls.
/// Returns 0 on success, -1 on error. /// Returns 0 on success, -1 on error.
/// NOTE: No panic::catch_unwind here — Android's Kotlin dispatcher thread has
/// very limited stack (~1MB) and the unwind machinery overflows it.
#[unsafe(no_mangle)] #[unsafe(no_mangle)]
pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeStartSignaling<'a>( pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeStartSignaling<'a>(
mut env: JNIEnv<'a>, mut env: JNIEnv<'a>,
@@ -374,25 +376,20 @@ pub unsafe extern "system" fn Java_com_wzp_engine_WzpEngine_nativeStartSignaling
token_j: JString, token_j: JString,
alias_j: JString, alias_j: JString,
) -> jint { ) -> jint {
let result = panic::catch_unwind(panic::AssertUnwindSafe(|| { let h = unsafe { handle_ref(handle) };
let h = unsafe { handle_ref(handle) }; let relay_addr: String = env.get_string(&relay_addr_j).map(|s| s.into()).unwrap_or_default();
let relay_addr: String = env.get_string(&relay_addr_j).map(|s| s.into()).unwrap_or_default(); let seed_hex: String = env.get_string(&seed_hex_j).map(|s| s.into()).unwrap_or_default();
let seed_hex: String = env.get_string(&seed_hex_j).map(|s| s.into()).unwrap_or_default(); let token: String = env.get_string(&token_j).map(|s| s.into()).unwrap_or_default();
let token: String = env.get_string(&token_j).map(|s| s.into()).unwrap_or_default(); let alias: String = env.get_string(&alias_j).map(|s| s.into()).unwrap_or_default();
let alias: String = env.get_string(&alias_j).map(|s| s.into()).unwrap_or_default();
h.engine.start_signaling( match h.engine.start_signaling(
&relay_addr, &relay_addr,
&seed_hex, &seed_hex,
if token.is_empty() { None } else { Some(&token) }, if token.is_empty() { None } else { Some(&token) },
if alias.is_empty() { None } else { Some(&alias) }, if alias.is_empty() { None } else { Some(&alias) },
) ) {
})); Ok(()) => 0,
Err(e) => { error!("start_signaling failed: {e}"); -1 }
match result {
Ok(Ok(())) => 0,
Ok(Err(e)) => { error!("start_signaling failed: {e}"); -1 }
Err(_) => { error!("start_signaling panicked"); -1 }
} }
} }