mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-24 04:12:20 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix android crash caused by outdated video frame ptr (#7996)

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2024-05-09 22:53:01 +08:00 committed by GitHub
parent 73662ed7d9
commit c640f7ed12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/scrap/src/android/ffi.rs
View File

@ -48,6 +48,8 @@ impl FrameRaw {
fn set_enable(&mut self, value: bool) { fn set_enable(&mut self, value: bool) {
self.enable = value; self.enable = value;
self.ptr.store(std::ptr::null_mut(), SeqCst);
self.len = 0;
} }
fn update(&mut self, data: *mut u8, len: usize) { fn update(&mut self, data: *mut u8, len: usize) {
@ -141,11 +143,7 @@ pub extern "system" fn Java_ffi_FFI_setFrameRawEnable(
} }
#[no_mangle] #[no_mangle]
pub extern "system" fn Java_ffi_FFI_init( pub extern "system" fn Java_ffi_FFI_init(env: JNIEnv, _class: JClass, ctx: JObject) {
env: JNIEnv,
_class: JClass,
ctx: JObject,
) {
log::debug!("MainService init from java"); log::debug!("MainService init from java");
if let Ok(jvm) = env.get_java_vm() { if let Ok(jvm) = env.get_java_vm() {
*JVM.write().unwrap() = Some(jvm); *JVM.write().unwrap() = Some(jvm);