Merge from savannah/emacs-30

58e4bfe3408 Add two missing NULL checks of malloc'd values on Android
81ca9c75f11 ; * etc/PROBLEMS: Document how to grant storage permissio...
d82d4689794 ; * etc/TODO: Rethink finder-known-keywords.
b9b9c33dcbe Fix (Non)GNU ELPA description in manual
87a61eba1b8 Move 'package-archives' documentation to emacs manual
316e47c5af4 ; * src/fns.c (Fmapconcat): Doc fix (bug#76242).
3cfbeb3fca1 ; Fix >72 character long lines in docstring
c68886ddb76 ; Change "virus" to "malicious" in lispref
6701866be4d Document (Non-)GNU ELPA in emacs manual
02851768b72 ; * .mailmap: Add entry for Thuna.  (Bug#76221)
2d7a8cbf4c8 Fix author name
19314257485 Use c-ts-common's comment setup in go-ts-mode (bug#75978)
316893ca387 Add java-language-server to eglot-server-programs

1 files changed, 10 insertions, 0 deletions

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)