aboutsummaryrefslogtreecommitdiffstats
path: root/src/android.c
diff options
context:
space:
mode:
authorPo Lu2025-02-15 16:58:18 +0800
committerPo Lu2025-02-15 16:58:18 +0800
commit58e4bfe3408f5f4562bf02ac200b680329f487c2 (patch)
treee32e49944c32b1a469ac2b3db47336e62eb3a724 /src/android.c
parent81ca9c75f1170f2b4cc85c69e859f68da4c508e4 (diff)
downloademacs-58e4bfe3408f5f4562bf02ac200b680329f487c2.tar.gz
emacs-58e4bfe3408f5f4562bf02ac200b680329f487c2.zip
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.
Diffstat (limited to 'src/android.c')
-rw-r--r--src/android.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/android.c b/src/android.c
index 0234fd50f69..c20730460be 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2530,6 +2530,11 @@ NATIVE_NAME (sendDndUri) (JNIEnv *env, jobject object,
2530 2530
2531 length = (*env)->GetStringLength (env, string); 2531 length = (*env)->GetStringLength (env, string);
2532 buffer = malloc (length * sizeof *buffer); 2532 buffer = malloc (length * sizeof *buffer);
2533
2534 /* Out of memory. */
2535 if (!buffer)
2536 return 0;
2537
2533 characters = (*env)->GetStringChars (env, string, NULL); 2538 characters = (*env)->GetStringChars (env, string, NULL);
2534 2539
2535 if (!characters) 2540 if (!characters)
@@ -2567,6 +2572,11 @@ NATIVE_NAME (sendDndText) (JNIEnv *env, jobject object,
2567 2572
2568 length = (*env)->GetStringLength (env, string); 2573 length = (*env)->GetStringLength (env, string);
2569 buffer = malloc (length * sizeof *buffer); 2574 buffer = malloc (length * sizeof *buffer);
2575
2576 /* Out of memory. */
2577 if (!buffer)
2578 return 0;
2579
2570 characters = (*env)->GetStringChars (env, string, NULL); 2580 characters = (*env)->GetStringChars (env, string, NULL);
2571 2581
2572 if (!characters) 2582 if (!characters)