Merge "Peer address can be null, check for null value in jni before calling str2addr/GetStringUTFChars which may crash on some platforms if given null." into main

1 files changed, 5 insertions, 1 deletions

diff --git a/android/app/jni/com_android_bluetooth_gatt.cpp b/android/app/jni/com_android_bluetooth_gatt.cpp
index acd609f8bd..be0922c8fc 100644
--- a/android/app/jni/com_android_bluetooth_gatt.cpp
+++ b/android/app/jni/com_android_bluetooth_gatt.cpp
@@ -2353,7 +2353,11 @@ static AdvertiseParameters parseParams(JNIEnv* env, jobject i) {
   p.secondary_advertising_phy = secondaryPhy;
   p.scan_request_notification_enable = false;
   p.own_address_type = ownAddressType;
-  p.peer_address = str2addr(env, peerAddress);
+  if (peerAddress == nullptr) {
+    p.peer_address = RawAddress::kEmpty;
+  } else {
+    p.peer_address = str2addr(env, peerAddress);
+  }
   p.peer_address_type = peerAddressType;
   p.discoverable = isDiscoverable;
   return p;