commit cad76b62422edc07f7358114d47fc486ecfc1017
author Ashlesh Gawande <agawande@memphis.edu> Tue Apr 04 15:28:30 2017 -0500
committer Ashlesh Gawande <agawande@memphis.edu> Tue Apr 04 16:14:57 2017 -0500
tree 4f128939580e268b0de98ee45ebcfae11d809c66
parent 0d97692b4008a338ea9be6d7f0ee0e09aa596b4d

fw: ASF should check if FaceInfo exists before using it

refs: #3968

Change-Id: I4c20a51609dd714e6104b103a4bef63ac8761083

daemon/fw/asf-measurements.hpp

diff --git a/daemon/fw/asf-measurements.hpp b/daemon/fw/asf-measurements.hpp
index c6ff096..ba858df 100644
--- a/daemon/fw/asf-measurements.hpp
+++ b/daemon/fw/asf-measurements.hpp
@@ -215,10 +215,15 @@
   void
   extendFaceInfoLifetime(FaceInfo& info, const Face& face);
 
-  FaceInfo&
+  FaceInfo*
   get(nfd::face::FaceId faceId)
   {
-    return m_fit.at(faceId);
+    if (m_fit.find(faceId) != m_fit.end()) {
+      return &m_fit.at(faceId);
+    }
+    else {
+      return nullptr;
+    }
   }
 
   FaceInfoTable::iterator