Fix intermittant crashes in location

Deleting memory without setting it to null
can cause the memory to still be non-null
and be interpreted as valid.
Also check if the entry is in the map using
find instead of assuming it is in the map.

Bug: 62033719 62033834 62033690 62033563 62032790
CRs-fixed: 2050837
Change-Id: I2534de2d6157be86ac95cfe6615e4c0019ee48fd

1 files changed, 15 insertions, 3 deletions

diff --git a/location/LocationAPIClientBase.h b/location/LocationAPIClientBase.h
index 8bbaa3d..832dca8 100644
--- a/location/LocationAPIClientBase.h
+++ b/location/LocationAPIClientBase.h
@@ -197,19 +197,31 @@ private:
         }
         uint32_t getId(uint32_t session) {
             pthread_mutex_lock(&mBiDictMutex);
-            uint32_t ret = mBackwardMap[session];
+            uint32_t ret = 0;
+            auto it = mBackwardMap.find(session);
+            if (it != mBackwardMap.end()) {
+                ret = it->second;
+            }
             pthread_mutex_unlock(&mBiDictMutex);
             return ret;
         }
         uint32_t getSession(uint32_t id) {
             pthread_mutex_lock(&mBiDictMutex);
-            uint32_t ret = mForwardMap[id];
+            uint32_t ret = 0;
+            auto it = mForwardMap.find(id);
+            if (it != mForwardMap.end()) {
+                ret = it->second;
+            }
             pthread_mutex_unlock(&mBiDictMutex);
             return ret;
         }
         uint32_t getType(uint32_t session) {
             pthread_mutex_lock(&mBiDictMutex);
-            uint32_t ret = mTypeMap[session];
+            uint32_t ret = 0;
+            auto it = mTypeMap.find(session);
+            if (it != mTypeMap.end()) {
+                ret = it->second;
+            }
             pthread_mutex_unlock(&mBiDictMutex);
             return ret;
         }