From 08e4a0d887ddcdc9d6416b015ceb6316fe0912e9 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Sat, 15 Feb 2025 16:58:18 +0800 Subject: [PATCH] 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) --- src/android.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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) -- 2.39.5