Merge pull request #2332 from particle-iot/bug/ble_possible_memory_leak

Free malloc'ed memory
particle-iot · Jun 28, 2021 · b611090 · b611090
2 parents ae01e6a + 124d24b
commit b611090
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/wiring/src/spark_wiring_ble.cpp b/wiring/src/spark_wiring_ble.cpp
@@ -2444,6 +2444,11 @@ class BleScanDelegator {
             }
             if (srLen == filterCustomDatalen) {
                 uint8_t* buf = (uint8_t*)malloc(srLen);
+                SCOPE_GUARD({
+                    if (buf) {
+                        free(buf);
+                    }
+                });
                 if (!buf) {
                     LOG(ERROR, "Failed to allocate memory!");
                     return false;
@@ -2455,6 +2460,11 @@ class BleScanDelegator {
             }
             if (advLen == filterCustomDatalen) {
                 uint8_t* buf = (uint8_t*)malloc(advLen);
+                SCOPE_GUARD({
+                    if (buf) {
+                        free(buf);
+                    }
+                });
                 if (!buf) {
                     LOG(ERROR, "Failed to allocate memory!");
                     return false;