return error codes

paul-szczepanek-arm · paul-szczepanek-arm · commit cd9f12ab4586 · 2018-05-18T13:59:30.000+01:00
diff --git a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
@@ -788,6 +788,8 @@ ble_error_t GenericSecurityManager::init_database(
 }
 
 ble_error_t GenericSecurityManager::init_resolving_list() {
+    if (!_db) return BLE_ERROR_INITIALIZATION_INCOMPLETE;
+
     /* match the resolving list to the currently stored set of IRKs */
     uint8_t resolving_list_capacity = _pal.read_resolving_list_capacity();
     SecurityEntryIdentity_t* identity_list_p =
@@ -803,7 +805,11 @@ ble_error_t GenericSecurityManager::init_resolving_list() {
             mbed::callback(this, &GenericSecurityManager::on_identity_list_retrieved),
             identity_list
         );
+    } else {
+        return BLE_ERROR_NO_MEM;
     }
+
+    return BLE_ERROR_NONE;
 }
 
 ble_error_t GenericSecurityManager::init_signing() {

Original file line number	Diff line number	Diff line change
`@@ -788,6 +788,8 @@ ble_error_t GenericSecurityManager::init_database(`
`788`	`788`	`}`
`789`	`789`
`790`	`790`	`ble_error_t GenericSecurityManager::init_resolving_list() {`
	`791`	`+ if (!_db) return BLE_ERROR_INITIALIZATION_INCOMPLETE;`
	`792`	`+`
`791`	`793`	`/* match the resolving list to the currently stored set of IRKs */`
`792`	`794`	`uint8_t resolving_list_capacity = _pal.read_resolving_list_capacity();`
`793`	`795`	`SecurityEntryIdentity_t* identity_list_p =`
`@@ -803,7 +805,11 @@ ble_error_t GenericSecurityManager::init_resolving_list() {`
`803`	`805`	`mbed::callback(this, &GenericSecurityManager::on_identity_list_retrieved),`
`804`	`806`	`identity_list`
`805`	`807`	`);`
	`808`	`+ } else {`
	`809`	`+ return BLE_ERROR_NO_MEM;`
`806`	`810`	`}`
	`811`	`+`
	`812`	`+ return BLE_ERROR_NONE;`
`807`	`813`	`}`
`808`	`814`
`809`	`815`	`ble_error_t GenericSecurityManager::init_signing() {`