commit 721af5b615045ebc84844f796c9f365ab2fc2adb
author Steven Moreland <smoreland@google.com> Wed Sep 25 23:23:34 2024 +0000
committer Pawan Wagh <waghpawan@google.com> Thu Sep 26 00:20:07 2024 +0000
tree 8d6843f0a1917c19868c9b2e7d54711ae47ea9f0
parent 0d6e60f85a938f4456f5d0d9c5c91e2abce1b924

libbinder_ndk: allow null codeToFunction.

If this is null (as in the fuzzer), it crashes.

Bug: N/A
Test: N/A
Change-Id: Icd0107d1fada88abad3375d619b672cae64190db

libs/binder/ndk/include_cpp/android/binder_interface_utils.h

diff --git a/libs/binder/ndk/include_cpp/android/binder_interface_utils.h b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h
index 379bdbb..c3e5d18 100644
--- a/libs/binder/ndk/include_cpp/android/binder_interface_utils.h
+++ b/libs/binder/ndk/include_cpp/android/binder_interface_utils.h
@@ -292,7 +292,10 @@
 #if !defined(__ANDROID_PRODUCT__) && \
         (defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) || __ANDROID_API__ >= 36)
     if API_LEVEL_AT_LEAST (36, 202504) {
-        AIBinder_Class_setTransactionCodeToFunctionNameMap(clazz, codeToFunction, functionCount);
+        if (codeToFunction != nullptr) {
+            AIBinder_Class_setTransactionCodeToFunctionNameMap(clazz, codeToFunction,
+                                                               functionCount);
+        }
     }
 #else
     (void)codeToFunction;