Merge pull request #157 from LLNL/develop

Release 0.0.7-patch3

src/gotcha_dl.c

@@ -159,14 +159,16 @@ static void *dlsym_wrapper(void *handle, const char *symbol_name) {
   int result = lookup_hashtable(&function_hash_table, (hash_key_t)symbol_name,
                                 (hash_data_t *)&binding);
   void *val = orig_dlsym(handle, symbol_name);
-  void **wrappee_ptr = getInternalBindingAddressPointer(
-      (struct internal_binding_t **)binding->user_binding->function_handle);
-  if (result != -1 && (val == NULL || *wrappee_ptr == val)) {
-    // if the wrapper is found and the wrappee is the function requested.
-    // This is needed in cases where we wrap a function F1 from library A and
-    // we dynamically load function F1 from library B. As name is same, we need
-    // to make sure the wrappee are the same as well
-    return binding->user_binding->wrapper_pointer;
+  if (result != -1) {
+    void **wrappee_ptr = getInternalBindingAddressPointer(
+        (struct internal_binding_t **)binding->user_binding->function_handle);
+    if (val == NULL || *wrappee_ptr == val) {
+      // if the wrapper is found and the wrappee is the function requested.
+      // This is needed in cases where we wrap a function F1 from library A and
+      // we dynamically load function F1 from library B. As name is same, we
+      // need to make sure the wrappee are the same as well
+      return binding->user_binding->wrapper_pointer;
+    }
   }
   if (handle == RTLD_NEXT) {
     struct link_map *lib = gotchas_dlsym_rtld_next_lookup(