fixup! Try to respect RPATHS of calling dlopen modules with dlinfo

bloomberg · Sep 4, 2024 · 15caf46 · 15caf46
1 parent ca420a4
commit 15caf46
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/memray/_memray/hooks.cpp b/src/memray/_memray/hooks.cpp
@@ -352,17 +352,12 @@ dlopen(const char* filename, int flag) noexcept
                         if (dlinfo(caller, RTLD_DI_SERINFO, paths) == 0) {
                             for (unsigned int i = 0; i != paths->dls_cnt; ++i) {
                                 const char* name = paths->dls_serpath[i].dls_name;
-                                std::string dir;
                                 if (name == nullptr || name[0] == '\0') {
-                                    // In the dynamic linking search path, an
-                                    // empty entry typically represents the
-                                    // current working directory ($PWD).
-                                    dir = "./";
-                                } else {
-                                    dir = name;
-                                    if (dir.back() != '/') {
-                                        dir += '/';
-                                    }
+                                    continue;
+                                }
+                                std::string dir = name;
+                                if (dir.back() != '/') {
+                                    dir += '/';
                                 }
 
                                 dir += filename;