zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-07-22 01:05:54 +02:00
Code Issues Projects Releases Packages Wiki Activity

NDRUnicodeString: Added constructor argument allowing skipping writing null terminator character

Browse source
This commit is contained in:
TalAloni 2021-01-11 22:33:15 +02:00
parent d1dadc00e6
commit 28549bb6ac
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
SMBLibrary/RPC/NDR/NDRUnicodeString.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2014-2020 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
* *
* You can redistribute this program and/or modify it under the terms of * You can redistribute this program and/or modify it under the terms of
* the GNU Lesser Public License as published by the Free Software Foundation, * the GNU Lesser Public License as published by the Free Software Foundation,
@ -13,15 +13,21 @@ namespace SMBLibrary.RPC
{ {
public class NDRUnicodeString : INDRStructure public class NDRUnicodeString : INDRStructure
{ {
private bool m_writeNullTerminationCharacter;
public string Value; public string Value;
public NDRUnicodeString() public NDRUnicodeString() : this(String.Empty, true)
{ {
Value = String.Empty;
} }
public NDRUnicodeString(string value) public NDRUnicodeString(string value) : this(value, true)
{ {
}
public NDRUnicodeString(string value, bool writeNullTerminationCharacter)
{
m_writeNullTerminationCharacter = writeNullTerminationCharacter;
Value = value; Value = value;
} }
@ -39,36 +45,37 @@ namespace SMBLibrary.RPC
// actualCount includes the null terminator // actualCount includes the null terminator
uint actualCount = parser.ReadUInt32(); uint actualCount = parser.ReadUInt32();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (int position = 0; position < actualCount - 1; position++) for (int position = 0; position < actualCount; position++)
{ {
builder.Append((char)parser.ReadUInt16()); builder.Append((char)parser.ReadUInt16());
} }
this.Value = builder.ToString(); this.Value = builder.ToString().TrimEnd('\0');
parser.ReadUInt16(); // null terminator
} }
public void Write(NDRWriter writer) public void Write(NDRWriter writer)
{ {
int length = 0; string valueToWrite = String.Empty;
if (Value != null) if (Value != null)
{ {
length = Value.Length; valueToWrite = Value;
} }
// maxCount includes the null terminator if (m_writeNullTerminationCharacter)
uint maxCount = (uint)(length + 1); {
valueToWrite += '\0';
}
uint maxCount = (uint)valueToWrite.Length;
writer.WriteUInt32(maxCount); writer.WriteUInt32(maxCount);
// the offset from the first index of the string to the first index of the actual subset being passed // the offset from the first index of the string to the first index of the actual subset being passed
uint index = 0; uint index = 0;
writer.WriteUInt32(index); writer.WriteUInt32(index);
// actualCount includes the null terminator uint actualCount = (uint)valueToWrite.Length;
uint actualCount = (uint)(length + 1);
writer.WriteUInt32(actualCount); writer.WriteUInt32(actualCount);
for (int position = 0; position < length; position++) for (int position = 0; position < valueToWrite.Length; position++)
{ {
writer.WriteUInt16((ushort)Value[position]); writer.WriteUInt16((ushort)valueToWrite[position]);
} }
writer.WriteUInt16(0); // null terminator
} }
} }
} }