From: Po Lu <luangruo@yahoo.com>
Date: Sun, 16 Mar 2025 12:12:52 +0000 (+0800)
Subject: Fix clipboard object handle leak on Android 3.1 to 11.0
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c50120d1a9065485306b94b49fab5cc4367e1654;p=emacs.git

Fix clipboard object handle leak on Android 3.1 to 11.0

* src/androidselect.c (extract_fd_offsets): Release retrieved
ParcelFileDescriptor objects on APIs 12 through 30.

(cherry picked from commit 2d5cf228186184b5af6e4e8ee8f5280f67f407bc)
---

diff --git a/src/androidselect.c b/src/androidselect.c
index 8d3cfac1df9..337747cbcb4 100644
--- a/src/androidselect.c
+++ b/src/androidselect.c
@@ -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;
     }