Updated DiskAccessLibrary

DiskAccessLibrary/FileSystems/NTFS/DataRun.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2018 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * 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,
@@ -6,7 +6,7 @@
  */
 using System;
 using System.Collections.Generic;
-using System.Text;
+using System.IO;
 
 namespace DiskAccessLibrary.FileSystems.NTFS
 {
@@ -18,21 +18,30 @@ namespace DiskAccessLibrary.FileSystems.NTFS
         public long RunOffset; // In clusters, relative to previous data run start LCN
         public bool IsSparse;
 
-        /// <returns>Run length</returns>
+        /// <returns>Record length</returns>
         public int Read(byte[] buffer, int offset)
         {
             int runOffsetSize = buffer[offset] >> 4;
             int runLengthSize = buffer[offset] & 0x0F;
 
             RunLength = ReadVarLong(ref buffer, offset + 1, runLengthSize);
+            if (RunLength < 0)
+            {
+                throw new InvalidDataException("Invalid Data Run record");
+            }
             RunOffset = ReadVarLong(ref buffer, offset + 1 + runLengthSize, runOffsetSize);
-            IsSparse = runOffsetSize == 0;
+            IsSparse = (runOffsetSize == 0);
 
             return 1 + runLengthSize + runOffsetSize;
         }
 
         public byte[] GetBytes()
         {
+            if (IsSparse)
+            {
+                RunOffset = 0;
+            }
+
             byte[] buffer = new byte[RecordLength];
             int runLengthSize = WriteVarLong(buffer, 1, RunLength);
             int runOffsetSize;

DiskAccessLibrary/FileSystems/NTFS/FileRecord/MultiSectorHelper.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2014-2018 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * 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,
@@ -45,9 +45,7 @@ namespace DiskAccessLibrary.FileSystems.NTFS
             // Read in the bytes that are replaced by the USN
             for (int i = 0; i < numberOfStrides; i++)
             {
-                byte[] endOfSectorBytes = new byte[2];
-                endOfSectorBytes[0] = buffer[offset + (BytesPerStride * (i + 1)) - 2];
-                endOfSectorBytes[1] = buffer[offset + (BytesPerStride * (i + 1)) - 2];
+                byte[] endOfSectorBytes = ByteReader.ReadBytes(buffer, offset + (BytesPerStride * (i + 1)) - 2, 2);
                 updateSequenceReplacementData.Add(endOfSectorBytes);
             }
 

DiskAccessLibrary/LogicalDiskManager/KernelUpdateLog/KernalUpdateLog.cs

@@ -51,7 +51,7 @@ namespace DiskAccessLibrary.LogicalDiskManager
             List<KernelUpdateLogPage> pages = new List<KernelUpdateLogPage>();
             KernelUpdateLogPage firstPage = KernelUpdateLogPage.ReadFromDisk(disk, privateHeader, tocBlock, 0);
             pages.Add(firstPage);
-            for (int index = 2; index < firstPage.NumberOfPages; index++)
+            for (int index = 1; index < firstPage.NumberOfPages; index++)
             {
                 KernelUpdateLogPage page = KernelUpdateLogPage.ReadFromDisk(disk, privateHeader, tocBlock, index);
                 pages.Add(page);

DiskAccessLibrary/LogicalDiskManager/PrivateHeader.cs

@@ -53,11 +53,11 @@ namespace DiskAccessLibrary.LogicalDiskManager
         public ulong PrivateRegionStartLBA;
         public ulong PrivateRegionSizeLBA;
         /// <summary>
-        /// PrimaryTocLBA / SecondaryTocLBA: on write operation, the updated TOC will be written to PreviousPrimaryTocLBA / PreviousSecondaryTocLBA,
+        /// PrimaryTocLBA / SecondaryTocLBA: on write operation, the updated TOC will be written to a different location,
         /// and then PrimaryTocLBA / SecondaryTocLBA will be updated to point to it.
         /// </summary>
-        public ulong PrimaryTocLBA; // Note: We have the previous TOC (update-sequence-number wise) adjacent, see PreviousPrimaryTocLBA
-        public ulong SecondaryTocLBA; // Note: We have the previous TOC adjacent, see PreviousSecondaryTocLBA
+        public ulong PrimaryTocLBA;
+        public ulong SecondaryTocLBA;
         public uint NumberOfConfigs; // in private region?
         public uint NumberOfLogs;    // in private region?
         public ulong ConfigSizeLBA;  // all config regions in private region in total?

DiskAccessLibrary/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Tal Aloni")]
 [assembly: AssemblyProduct("DiskAccessLibrary")]
-[assembly: AssemblyCopyright("Copyright © Tal Aloni 2012-2016")]
+[assembly: AssemblyCopyright("Copyright © Tal Aloni 2012-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.5.0")]
-[assembly: AssemblyFileVersion("1.4.5.0")]
+[assembly: AssemblyVersion("1.4.7.0")]
+[assembly: AssemblyFileVersion("1.4.7.0")]

DiskAccessLibrary/RevisionHistory.txt

@@ -98,4 +98,12 @@ Revision History:
 
 1.4.5 - IFileSystem: Added FileOptions parameter to OpenFile.
         DeviceInterfaceUtils: Added GetDeviceList method.
+        Minor changes and improvements.
+
+1.4.6 - Win32Errors enum: Added ERROR_INVALID_DATA
+        Bugfix: The second KLOG page was not read.
 		Minor changes and improvements.
+        Corrected documentation.
+
+1.4.7 - Bugfix: NTFS File Records that exceeded 511 bytes were corrupted during write.
+        Minor improvements to NTFS Data Run record implementation.