commit 851228a374af39520fd0e802953fc35bfdefc1b1
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Oct 20 15:55:28 2014 -0400
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Oct 20 15:55:28 2014 -0400
tree 25cdab3142637321a07d76806f90b14f708f5af8
parent 7e6fefc4a2e2ed120bdf70c2b631556ba908521b

face: Fix segfault caused by Face::unregisterPrefix when registeredPrefixId does not exist

Change-Id: I67e86679fc80506bca439a2a8264c485309f97f3

src/detail/face-impl.hpp

diff --git a/src/detail/face-impl.hpp b/src/detail/face-impl.hpp
index 8e48750..cd1b3d8 100644
--- a/src/detail/face-impl.hpp
+++ b/src/detail/face-impl.hpp
@@ -270,8 +270,11 @@
         (*i)->unregister(bind(&Impl::finalizeUnregisterPrefix, this, i, onSuccess),
                          bind(onFailure, _2));
       }
-    else
-      onFailure("Unrecognized PrefixId");
+    else {
+      if (static_cast<bool>(onFailure)) {
+        onFailure("Unrecognized PrefixId");
+      }
+    }
 
     // there cannot be two registered prefixes with the same id
   }