Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

[OpenMP] Improve dladdr error handling in ompd_init() (#201043)

Browse source 
Guard dlerror() result against NULL before passing to fprintf to avoid
confusing "(null)" output. Also guard dli_fname against NULL on the
success path before calling strrchr.

Assisted-by: Claude Sonnet 4.6
This commit is contained in:
Mark Zhuang 2026-06-18 11:03:07 -05:00 committed by GitHub
parent bd5da5b539
commit 74a146dd9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
openmp/runtime/src/ompd-specific.cpp
View file

@ -81,14 +81,24 @@ void ompd_init() {
char *libname = NULL;
const char *ompd_env_var = getenv("OMP_DEBUG");
int ompd_debug = ompd_env_var && !strcmp(ompd_env_var, "enabled");
#if KMP_OS_UNIX
// Find the location of libomp.so thru dladdr and replace the libomp with
// libompd to get the full path of libompd
Dl_info dl_info;
int ret = dladdr((void *)ompd_init, &dl_info);
if (!ret) {
fprintf(stderr, "%s\n", dlerror());
} else if (strrchr(dl_info.dli_fname, '/')) {
const char *err = dlerror();
if (ompd_debug || err)
fprintf(stderr,
"The OpenMP runtime could not determine the location of "
"libompd.so. If the debugger fails to load the library, make "
"sure to add the directory containing a compatible libompd.so "
"to your LD_LIBRARY_PATH%s%s\n",
err ? ": " : "", err ? err : "");
} else if (dl_info.dli_fname && strrchr(dl_info.dli_fname, '/')) {
int lib_path_length = strrchr(dl_info.dli_fname, '/') - dl_info.dli_fname;
libname =
(char *)malloc(lib_path_length + 12 /*for '/libompd.so' and '\0'*/);
@ -97,8 +107,7 @@ void ompd_init() {
}
#endif
const char *ompd_env_var = getenv("OMP_DEBUG");
if (ompd_env_var && !strcmp(ompd_env_var, "enabled")) {
if (ompd_debug) {
fprintf(stderr, "OMP_OMPD active\n");
ompt_enabled.enabled = 1;
ompd_state |= OMPD_ENABLE_BP;