[Bug #3216070] Loading extension libraries from embedded Tcl applications.

1 files changed, 13 insertions, 7 deletions

diff --git a/unix/tclLoadDl.c b/unix/tclLoadDl.c
index aeb06ef..96f0717 100644
--- a/unix/tclLoadDl.c
+++ b/unix/tclLoadDl.c
@@ -19,17 +19,17 @@
 
 /*
  * In some systems, like SunOS 4.1.3, the RTLD_NOW flag isn't defined and this
- * argument to dlopen must always be 1. The RTLD_GLOBAL flag is needed on some
- * systems (e.g. SCO and UnixWare) but doesn't exist on others; if it doesn't
- * exist, set it to 0 so it has no effect.
+ * argument to dlopen must always be 1. The RTLD_LOCAL flag doesn't exist on
+ * some platforms; if it doesn't exist, set it to 0 so it has no effect.
+ * See [Bug #3216070]
  */
 
 #ifndef RTLD_NOW
 #   define RTLD_NOW 1
 #endif
 
-#ifndef RTLD_GLOBAL
-#   define RTLD_GLOBAL 0
+#ifndef RTLD_LOCAL
+#   define RTLD_LOCAL 0
 #endif
 
 /*
@@ -82,7 +82,10 @@ TclpDlopen(
      */
 
     native = Tcl_FSGetNativePath(pathPtr);
-    handle = dlopen(native, RTLD_NOW | RTLD_GLOBAL);
+    /*
+     * Use (RTLD_NOW|RTLD_LOCAL) always, see [Bug #3216070]
+     */
+    handle = dlopen(native, RTLD_NOW | RTLD_LOCAL);
     if (handle == NULL) {
 	/*
 	 * Let the OS loader examine the binary search path for whatever
@@ -94,7 +97,10 @@ TclpDlopen(
 	const char *fileName = Tcl_GetString(pathPtr);
 
 	native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
-	handle = dlopen(native, RTLD_NOW | RTLD_GLOBAL);
+	/*
+	 * Use (RTLD_NOW|RTLD_LOCAL) always, see [Bug #3216070]
+	 */
+	handle = dlopen(native, RTLD_NOW | RTLD_LOCAL);
 	Tcl_DStringFree(&ds);
     }