procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clipboard object handle leak on Android 3.1 to 11.0

Browse source 
* src/androidselect.c (extract_fd_offsets): Release retrieved
ParcelFileDescriptor objects on APIs 12 through 30.
This commit is contained in:
Po Lu 2025-03-16 20:12:52 +08:00
parent b6b4a080a3
commit 2d5cf22818
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/androidselect.c
View file

@ -418,7 +418,10 @@ close_asset_fd (void *afd)
}
/* Return the offset, file descriptor and length of the data contained
in the asset file descriptor AFD, in *FD, *OFFSET, and *LENGTH.
in the asset file descriptor AFD, in *FD, *OFFSET, and *LENGTH. AFD
will not be released if an exception is detected; it is the
responsibility of the caller to arrange that it be.
Value is 0 upon success, 1 otherwise. */
static int
@ -487,6 +490,9 @@ extract_fd_offsets (jobject afd, int *fd, jlong *offset, jlong *length)
*fd = (*android_java_env)->CallIntMethod (android_java_env,
java_fd,
fd_class.get_fd);
android_exception_check_1 (java_fd);
ANDROID_DELETE_LOCAL_REF (java_fd);
if (*fd >= 0)
return 0;
}