From: Po Lu <luangruo@yahoo.com>
Date: Sat, 15 Feb 2025 08:58:18 +0000 (+0800)
Subject: Add two missing NULL checks of malloc'd values on Android
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08e4a0d887ddcdc9d6416b015ceb6316fe0912e9;p=emacs.git

Add two missing NULL checks of malloc'd values on Android

* src/android.c (sendDndUri, sendDndText): Verify that allocated
string memory is non-nil before writing to it.

(cherry picked from commit 58e4bfe3408f5f4562bf02ac200b680329f487c2)
---

diff --git a/src/android.c b/src/android.c
index f8d2df8fcf5..05b593f0f31 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2530,6 +2530,11 @@ NATIVE_NAME (sendDndUri) (JNIEnv *env, jobject object,
 
   length = (*env)->GetStringLength (env, string);
   buffer = malloc (length * sizeof *buffer);
+
+  /* Out of memory.  */
+  if (!buffer)
+    return 0;
+
   characters = (*env)->GetStringChars (env, string, NULL);
 
   if (!characters)
@@ -2567,6 +2572,11 @@ NATIVE_NAME (sendDndText) (JNIEnv *env, jobject object,
 
   length = (*env)->GetStringLength (env, string);
   buffer = malloc (length * sizeof *buffer);
+
+  /* Out of memory.  */
+  if (!buffer)
+    return 0;
+
   characters = (*env)->GetStringChars (env, string, NULL);
 
   if (!characters)