From cd9f12ab45868656c8acc2ccd85985d0aaf7fce9 Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Fri, 18 May 2018 13:59:30 +0100
Subject: [PATCH] return error codes

---
 .../FEATURE_BLE/source/generic/GenericSecurityManager.cpp   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
index bbfa5d28f6..903e271aa9 100644
--- 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() {