zydronium/SMBLibrary
1
0
Fork 0
mirror of https://github.com/TalAloni/SMBLibrary.git synced 2025-06-03 19:17:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

FileStreamInformation: WriteBytes: Set the value NextEntryOffset for each FileStreamEntry

Browse source
This commit is contained in:
Tal Aloni 2018-11-23 23:22:00 +02:00
parent 6d562c41e9
commit dfb37a818f
2 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileStreamEntry.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2017-2018 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,
@ -53,5 +53,18 @@ namespace SMBLibrary
return FixedLength + StreamName.Length * 2; return FixedLength + StreamName.Length * 2;
} }
} }
/// <summary>
/// [MS-FSCC] When multiple FILE_STREAM_INFORMATION data elements are present in the buffer, each MUST be aligned on an 8-byte boundary
/// </summary>
public int PaddedLength
{
get
{
int length = this.Length;
int padding = (8 - (length % 8)) % 8;
return length + padding;
}
}
} }
} }

19
SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileStreamInformation.cs
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved. /* Copyright (C) 2017-2018 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,
@ -41,15 +41,10 @@ namespace SMBLibrary
for (int index = 0; index < m_entries.Count; index++) for (int index = 0; index < m_entries.Count; index++)
{ {
FileStreamEntry entry = m_entries[index]; FileStreamEntry entry = m_entries[index];
int entryLength = entry.PaddedLength;
entry.NextEntryOffset = (index < m_entries.Count - 1) ? (uint)entryLength : 0;
entry.WriteBytes(buffer, offset); entry.WriteBytes(buffer, offset);
int entryLength = entry.Length;
offset += entryLength; offset += entryLength;
if (index < m_entries.Count - 1)
{
// [MS-FSCC] When multiple FILE_STREAM_INFORMATION data elements are present in the buffer, each MUST be aligned on an 8-byte boundary
int padding = (8 - (entryLength % 8)) % 8;
offset += padding;
}
} }
} }
@ -77,14 +72,8 @@ namespace SMBLibrary
for (int index = 0; index < m_entries.Count; index++) for (int index = 0; index < m_entries.Count; index++)
{ {
FileStreamEntry entry = m_entries[index]; FileStreamEntry entry = m_entries[index];
int entryLength = entry.Length; int entryLength = (index < m_entries.Count - 1) ? entry.PaddedLength : entry.Length;
length += entryLength; length += entryLength;
if (index < m_entries.Count - 1)
{
// [MS-FSCC] When multiple FILE_STREAM_INFORMATION data elements are present in the buffer, each MUST be aligned on an 8-byte boundary
int padding = (8 - (entryLength % 8)) % 8;
length += padding;
}
} }
return length; return length;
} }