Avoid one large memory allocation per read descriptor/characteristic

We directly allocate into the QByteArray which continues to manage the
memory for us.

Change-Id: I39cd314a3cc9fcfd6bcf28836e0222d6d9a4f04f
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 6 insertions, 16 deletions

diff --git a/src/bluetooth/android/lowenergynotificationhub.cpp b/src/bluetooth/android/lowenergynotificationhub.cpp
index 709bbc68..30b69edc 100644
--- a/src/bluetooth/android/lowenergynotificationhub.cpp
+++ b/src/bluetooth/android/lowenergynotificationhub.cpp
@@ -161,14 +161,9 @@ void LowEnergyNotificationHub::lowEnergy_characteristicRead(
     QByteArray payload;
     if (data) { //empty Java byte array is 0x0
         jsize length = env->GetArrayLength(data);
-        jbyte* nativeData = (jbyte*) malloc(length * sizeof(jbyte));
-        if (!nativeData)
-            return;
-
-        env->GetByteArrayRegion(data, 0, length, nativeData);
-        payload = QByteArray(reinterpret_cast<const char*>(nativeData),
-                                 length); //takes deep copy of data
-        free(nativeData);
+        payload.resize(length);
+        env->GetByteArrayRegion(data, 0, length,
+                                reinterpret_cast<signed char*>(payload.data()));
     }
 
     QMetaObject::invokeMethod(hub, "characteristicRead", Qt::QueuedConnection,
@@ -202,14 +197,9 @@ void LowEnergyNotificationHub::lowEnergy_descriptorRead(
     QByteArray payload;
     if (data) { //empty Java byte array is 0x0
         jsize length = env->GetArrayLength(data);
-        jbyte* nativeData = (jbyte*) malloc(length * sizeof(jbyte));
-        if (!nativeData)
-            return;
-
-        env->GetByteArrayRegion(data, 0, length, nativeData);
-        payload = QByteArray(reinterpret_cast<const char*>(nativeData),
-                                 length); //takes deep copy of data
-        free(nativeData);
+        payload.resize(length);
+        env->GetByteArrayRegion(data, 0, length,
+                                reinterpret_cast<signed char*>(payload.data()));
     }
 
     QMetaObject::invokeMethod(hub, "descriptorRead", Qt::QueuedConnection,