fix(core) dlerror decoding. Close LWJGL#738

kb-1000 · Feb 24, 2022 · f28e4ea · f28e4ea
1 parent 90f1327
commit f28e4ea
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/doc/notes/3.3.2.md b/doc/notes/3.3.2.md
@@ -13,6 +13,7 @@ This build includes the following changes:
 #### Fixes
 
 - Core: Fixed Java/native library incompatibility detection. (#737)
+- Core: Fixed `dlerror` decoding to use UTF-8. (#738)
 - Build: Fixed offline mode with multiple local architectures. (#740)
 
 #### Breaking Changes

diff --git a/modules/lwjgl/core/src/generated/java/org/lwjgl/system/linux/DynamicLinkLoader.java b/modules/lwjgl/core/src/generated/java/org/lwjgl/system/linux/DynamicLinkLoader.java
@@ -99,7 +99,7 @@ public static long dlopen(@Nullable @NativeType("char const *") CharSequence fil
     @NativeType("char *")
     public static String dlerror() {
         long __result = ndlerror();
-        return memASCIISafe(__result);
+        return memUTF8Safe(__result);
     }
 
     // --- [ dlsym ] ---

diff --git a/modules/lwjgl/core/src/generated/java/org/lwjgl/system/macosx/DynamicLinkLoader.java b/modules/lwjgl/core/src/generated/java/org/lwjgl/system/macosx/DynamicLinkLoader.java
@@ -197,7 +197,7 @@ public static long dlopen(@Nullable @NativeType("char const *") CharSequence pat
     @NativeType("char const *")
     public static String dlerror() {
         long __result = ndlerror();
-        return memASCIISafe(__result);
+        return memUTF8Safe(__result);
     }
 
     // --- [ dlsym ] ---

diff --git a/modules/lwjgl/core/src/templates/kotlin/core/linux/templates/DynamicLinkLoader.kt b/modules/lwjgl/core/src/templates/kotlin/core/linux/templates/DynamicLinkLoader.kt
@@ -56,7 +56,7 @@ val dlfcn = "DynamicLinkLoader".nativeClass(Module.CORE_LINUX, nativeSubPath = "
         int("mode", "a bitfield", Modes, LinkMode.BITFIELD)
     )
 
-    charASCII.p(
+    charUTF8.p(
         "dlerror",
         """
         Returns a human readable string describing the most recent error that occurred from #dlopen(), #dlsym() or #dlclose() since

diff --git a/modules/lwjgl/core/src/templates/kotlin/core/macos/templates/DynamicLinkLoader.kt b/modules/lwjgl/core/src/templates/kotlin/core/macos/templates/DynamicLinkLoader.kt
@@ -97,7 +97,7 @@ val dlfcn = "DynamicLinkLoader".nativeClass(Module.CORE_MACOS, nativeSubPath = "
         )
     )
 
-    charASCII.const.p(
+    charUTF8.const.p(
         "dlerror",
         """
         Provides diagnostic information corresponding to problems with calls to #dlopen(), #dlsym(), and #dlclose() in the same thread.