Corrected return type MagickNET.GetEnvironmentVariable to a nullable …

…string.
dlemstra · Nov 12, 2023 · 4dabd6d · 4dabd6d
1 parent 9f47216
commit 4dabd6d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/Magick.NET/Helpers/Environment.cs b/src/Magick.NET/Helpers/Environment.cs
@@ -23,7 +23,7 @@ public static void Initialize()
         }
     }
 
-    public static string GetEnv(string name)
+    public static string? GetEnv(string name)
         => NativeEnvironment.GetEnv(name);
 
     public static void SetEnv(string name, string value)

diff --git a/src/Magick.NET/MagickNET.cs b/src/Magick.NET/MagickNET.cs
@@ -211,7 +211,7 @@ string IMagickNET.Version
     /// </summary>
     /// <param name="name">The name of the environment variable.</param>
     /// <returns>The environment variable with the specified name.</returns>
-    public static string GetEnvironmentVariable(string name)
+    public static string? GetEnvironmentVariable(string name)
     {
         Throw.IfNullOrEmpty(nameof(name), name);
         return Environment.GetEnv(name);

diff --git a/src/Magick.NET/Native/Helpers/Environment.cs b/src/Magick.NET/Native/Helpers/Environment.cs
@@ -71,7 +71,7 @@ public static void Initialize()
             NativeMethods.X86.Environment_Initialize();
             #endif
         }
-        public static string GetEnv(string name)
+        public static string? GetEnv(string name)
         {
             using var nameNative = UTF8Marshaler.CreateInstance(name);
             IntPtr result;
@@ -93,7 +93,7 @@ public static string GetEnv(string name)
             #if PLATFORM_x86 || PLATFORM_AnyCPU
             result = NativeMethods.X86.Environment_GetEnv(nameNative.Instance);
             #endif
-            return UTF8Marshaler.NativeToManaged(result);
+            return UTF8Marshaler.NativeToManagedAndRelinquish(result);
         }
         public static void SetEnv(string name, string value)
         {

diff --git a/src/Magick.NET/Native/Helpers/Environment.json b/src/Magick.NET/Native/Helpers/Environment.json
@@ -7,7 +7,7 @@
     },
     {
       "name": "GetEnv",
-      "type": "string",
+      "type": "nativeString?",
       "arguments": [
         {
           "name": "name",