Fix SilkMarshal.GetMaxSizeOf not including null terminator for NativeStringEncoding.LPStr (dotnet#823)

roeyskoe · web-flow · commit 073e45d090fc · 2022-03-05T19:24:34.000Z
diff --git a/src/Core/Silk.NET.Core/Native/SilkMarshal.cs b/src/Core/Silk.NET.Core/Native/SilkMarshal.cs
@@ -155,7 +155,7 @@ public static int GetMaxSizeOf(string? input, NativeStringEncoding encoding = Na
             => encoding switch
             {
                 NativeStringEncoding.BStr => -1,
-                NativeStringEncoding.LPStr => ((input?.Length ?? 0) + 1) * Marshal.SystemMaxDBCSCharSize,
+                NativeStringEncoding.LPStr => ((input?.Length ?? 0) + 1) * Marshal.SystemMaxDBCSCharSize + 1,
                 NativeStringEncoding.LPTStr => (input is null ? 0 : Encoding.UTF8.GetMaxByteCount(input.Length)) + 1,
                 NativeStringEncoding.LPUTF8Str => (input is null ? 0 : Encoding.UTF8.GetMaxByteCount(input.Length)) + 1,
                 NativeStringEncoding.LPWStr => ((input?.Length ?? 0) + 1) * 2,

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public static int GetMaxSizeOf(string? input, NativeStringEncoding encoding = Na`
`155`	`155`	`=> encoding switch`
`156`	`156`	`{`
`157`	`157`	`NativeStringEncoding.BStr => -1,`
`158`		`- NativeStringEncoding.LPStr => ((input?.Length ?? 0) + 1) * Marshal.SystemMaxDBCSCharSize,`
	`158`	`+ NativeStringEncoding.LPStr => ((input?.Length ?? 0) + 1) * Marshal.SystemMaxDBCSCharSize + 1,`
`159`	`159`	`NativeStringEncoding.LPTStr => (input is null ? 0 : Encoding.UTF8.GetMaxByteCount(input.Length)) + 1,`
`160`	`160`	`NativeStringEncoding.LPUTF8Str => (input is null ? 0 : Encoding.UTF8.GetMaxByteCount(input.Length)) + 1,`
`161`	`161`	`NativeStringEncoding.LPWStr => ((input?.Length ?? 0) + 1) * 2,`