Merge pull request ARMmbed#54 from paul-szczepanek-arm/fix-whitelist

Whitelist: fix not updating size of array

Author: Donatien Garnier

features/FEATURE_BLE/ble/generic/SecurityDb.h

@@ -584,28 +584,32 @@ class SecurityDb {
         WhitelistDbCb_t cb,
         ::Gap::Whitelist_t *whitelist
     ) {
-        for (size_t i = 0; i < get_entry_count() && i < whitelist->capacity; i++) {
+        for (size_t i = 0; i < get_entry_count() && whitelist->size < whitelist->capacity; i++) {
             entry_handle_t db_handle = get_entry_handle_by_index(i);
             SecurityDistributionFlags_t* flags = get_distribution_flags(db_handle);
 
             if (!flags) {
                 continue;
             }
 
+            SecurityEntryIdentity_t* identity = read_in_entry_peer_identity(db_handle);
+            if (!identity) {
+                continue;
+            }
+
+            memcpy(
+                whitelist->addresses[whitelist->size].address,
+                identity->identity_address.data(),
+                sizeof(BLEProtocol::AddressBytes_t)
+            );
+
             if (flags->peer_address_is_public) {
-                whitelist->addresses[i].type = BLEProtocol::AddressType::PUBLIC;
+                whitelist->addresses[whitelist->size].type = BLEProtocol::AddressType::PUBLIC;
             } else {
-                whitelist->addresses[i].type = BLEProtocol::AddressType::RANDOM_STATIC;
+                whitelist->addresses[whitelist->size].type = BLEProtocol::AddressType::RANDOM_STATIC;
             }
 
-            SecurityEntryIdentity_t* identity = read_in_entry_peer_identity(db_handle);
-            if (identity) {
-                memcpy(
-                    whitelist->addresses[i].address,
-                    identity->identity_address.data(),
-                    sizeof(BLEProtocol::AddressBytes_t)
-                );
-            }
+            whitelist->size++;
         }
 
         cb(whitelist);

features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp

@@ -142,6 +142,9 @@ ble_error_t GenericSecurityManager::purgeAllBondingState(void) {
 ble_error_t GenericSecurityManager::generateWhitelistFromBondTable(Gap::Whitelist_t *whitelist) const {
     if (!_db) return BLE_ERROR_INITIALIZATION_INCOMPLETE;
     if (eventHandler) {
+        if (!whitelist) {
+            return BLE_ERROR_INVALID_PARAM;
+        }
         _db->generate_whitelist_from_bond_table(
             mbed::callback(eventHandler, &::SecurityManager::EventHandler::whitelistFromBondTable),
             whitelist