sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug in marshaler for LSA_UNICODE_STRING under X64 that caused alignment error and failure on all calls. Thanks @ryannewington for identifying the problem and where to fix it (#169).

pull/180/head
dahall 2020-09-14 17:17:20 -06:00
parent bde637b8d3
commit da963a8115
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PInvoke/Security/AdvApi32/NTSecApi.Lsa.cs
View File

@ -3288,18 +3288,14 @@ namespace Vanara.PInvoke
internal static IntPtr MarshalValue(string value)
{
if (value is null) return IntPtr.Zero;
var length = (short)StringHelper.GetByteCount(value, false, CharSet.Unicode);
var lus = new LSA_UNICODE_STRING { length = (ushort)StringHelper.GetByteCount(value, false, CharSet.Unicode) };
var chSz = StringHelper.GetCharSize(CharSet.Unicode);
var maxLength = (short)(length + chSz);
var sz = 4 + IntPtr.Size + length + chSz;
var mem = Marshal.AllocCoTaskMem(sz);
using (var s = new NativeMemoryStream(mem, sz, System.IO.FileAccess.Write) { CharSet = CharSet.Unicode })
{
s.Write(length);
s.Write(maxLength);
s.WriteReference(value);
s.Flush();
}
lus.MaximumLength = (ushort)(lus.length + chSz);
var ssz = Marshal.SizeOf(typeof(LSA_UNICODE_STRING));
var mem = Marshal.AllocCoTaskMem(ssz + lus.MaximumLength);
lus.Buffer = mem.Offset(ssz);
mem.Write(lus);
StringHelper.Write(value, mem.Offset(ssz), out _, true, CharSet.Unicode, lus.MaximumLength);
return mem;
}
}