Batyka/zaprett-app
1
0
Fork 0
mirror of https://github.com/CherretGit/zaprett-app.git synced 2025-12-11 14:09:37 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix JNI seg fault

Browse Source
This commit is contained in:
CherretGit
2025-10-18 19:21:51 +07:00
parent c094a072b8
commit e8a8fa69db
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rust/src/lib.rs
View File

@@ -47,6 +47,11 @@ pub unsafe extern "system" fn Java_com_cherret_zaprett_byedpi_NativeBridge_jniSt
let mut argv: Vec<*const c_char> = cstrings.iter().map(|s| s.as_ptr()).collect(); let mut argv: Vec<*const c_char> = cstrings.iter().map(|s| s.as_ptr()).collect();
argv.push(std::ptr::null()); argv.push(std::ptr::null());
info!("starting proxy"); info!("starting proxy");
unsafe {
optind = 1;
optreset = 1;
clear_params();
}
PROXY_RUNNING.store(true, Ordering::SeqCst); PROXY_RUNNING.store(true, Ordering::SeqCst);
let ret = unsafe { main(argc as i32, argv.as_ptr()) }; let ret = unsafe { main(argc as i32, argv.as_ptr()) };
PROXY_RUNNING.store(false, Ordering::SeqCst); PROXY_RUNNING.store(false, Ordering::SeqCst);
@@ -65,10 +70,5 @@ pub unsafe extern "system" fn Java_com_cherret_zaprett_byedpi_NativeBridge_jniSt
} }
info!("stopping proxy"); info!("stopping proxy");
let ret = unsafe { shutdown(server_fd, SHUT_RDWR) }; let ret = unsafe { shutdown(server_fd, SHUT_RDWR) };
unsafe {
optreset = 1;
optind = 1;
}
unsafe { clear_params() };
ret as jint ret as jint
} }