Merge branch 'fix/compressv1-index-out-of-bounds'

Kaplas80 · Dec 6, 2020 · d5e3cf7 · d5e3cf7
2 parents 14c221a + f162260
commit d5e3cf7
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 7 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
     <PropertyGroup>
-        <Version>1.3.0</Version>
+        <Version>1.3.1</Version>
         <Product>ParManager</Product>
 
         <Authors>Kaplas</Authors>

diff --git a/ParLibrary/Sllz/Compressor.cs b/ParLibrary/Sllz/Compressor.cs
@@ -138,6 +138,11 @@ private static DataStream CompressV1(DataStream inputDataStream)
             outputData[flagPosition] = 0x00;
             outputPosition++;
 
+            if (outputPosition >= outputSize)
+            {
+                throw new SllzCompressorException("Compressed size is bigger than original size.");
+            }
+
             while (inputPosition < inputData.Length)
             {
                 uint windowSize = Math.Min(inputPosition, MAX_WINDOW_SIZE);
@@ -168,6 +173,7 @@ private static DataStream CompressV1(DataStream inputDataStream)
                     outputData[outputPosition] = inputData[inputPosition];
                     inputPosition++;
                     outputPosition++;
+
                     if (outputPosition >= outputSize)
                     {
                         throw new SllzCompressorException("Compressed size is bigger than original size.");
@@ -201,6 +207,12 @@ private static DataStream CompressV1(DataStream inputDataStream)
 
                     outputData[outputPosition] = (byte)tuple;
                     outputPosition++;
+
+                    if (outputPosition >= outputSize)
+                    {
+                        throw new SllzCompressorException("Compressed size is bigger than original size.");
+                    }
+
                     outputData[outputPosition] = (byte)(tuple >> 8);
                     outputPosition++;
 

diff --git a/ParTool/Program.Add.cs b/ParTool/Program.Add.cs
@@ -62,7 +62,7 @@ private static void Add(Options.Add opts)
 
             Console.Write("Reading input directory... ");
             string nodeName = new DirectoryInfo(opts.AddDirectory).Name;
-            Node node = NodeFactory.FromDirectory(opts.AddDirectory, "*", nodeName, true);
+            Node node = ReadDirectory(opts.AddDirectory, nodeName);
             node.TransformWith<ParArchiveWriter, ParArchiveWriterParameters>(writerParameters).TransformWith<ParArchiveReader, ParArchiveReaderParameters>(readerParameters);
             Console.WriteLine("DONE!");
 

diff --git a/ParTool/Program.Create.cs b/ParTool/Program.Create.cs
@@ -46,7 +46,7 @@ private static void Create(Options.Create opts)
 
             Console.Write("Reading input directory... ");
             string nodeName = new DirectoryInfo(opts.InputDirectory).Name;
-            Node node = NodeFactory.FromDirectory(opts.InputDirectory, "*", nodeName, true);
+            Node node = ReadDirectory(opts.InputDirectory, nodeName);
 
 #pragma warning disable CA1308 // Normalize strings to uppercase
             node.SortChildren((x, y) => string.CompareOrdinal(x.Name.ToLowerInvariant(), y.Name.ToLowerInvariant()));

diff --git a/ParTool/Program.Extract.cs b/ParTool/Program.Extract.cs
@@ -54,18 +54,19 @@ private static void Extract(Node parNode, string outputFolder)
         {
             foreach (Node node in Navigator.IterateNodes(parNode))
             {
+                string fileInfoPath = node.Path.Substring(parNode.Path.Length).Replace('/', Path.DirectorySeparatorChar);
+                string outputPath = Path.Join(outputFolder, fileInfoPath);
+
                 var file = node.GetFormatAs<ParFile>();
+
                 if (file == null)
                 {
+                    Directory.CreateDirectory(outputPath);
                     continue;
                 }
 
                 Console.Write($"Extracting {node.Path}... ");
 
-                string fileInfoPath = node.Path.Substring(parNode.Path.Length).Replace('/', Path.DirectorySeparatorChar);
-                string outputPath = Path.Join(outputFolder, fileInfoPath);
-                Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
-
                 if (file.IsCompressed)
                 {
                     node.TransformWith<ParLibrary.Sllz.Decompressor>();

diff --git a/ParTool/Program.cs b/ParTool/Program.cs
@@ -7,6 +7,7 @@ namespace ParTool
     using System.IO;
     using CommandLine;
     using CommandLine.Text;
+    using Yarhl.FileSystem;
 
     /// <summary>
     /// Main program.
@@ -78,5 +79,39 @@ private static void WriteHeader()
             Console.WriteLine(CommandLine.Text.CopyrightInfo.Default);
             Console.WriteLine();
         }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute(
+            "Reliability",
+            "CA2000:Dispose objects before losing scope",
+            Justification = "Ownserhip dispose transferred")]
+        private static Node ReadDirectory(string dirPath, string nodeName = "")
+        {
+            dirPath = Path.GetFullPath(dirPath);
+
+            if (string.IsNullOrEmpty(nodeName))
+            {
+                nodeName = Path.GetFileName(dirPath);
+            }
+
+            Node container = Yarhl.FileSystem.NodeFactory.CreateContainer(nodeName);
+            var directoryInfo = new DirectoryInfo(dirPath);
+            container.Tags["DirectoryInfo"] = directoryInfo;
+
+            var files = directoryInfo.GetFiles();
+            foreach (FileInfo file in files)
+            {
+                Node fileNode = Yarhl.FileSystem.NodeFactory.FromFile(file.FullName);
+                container.Add(fileNode);
+            }
+
+            var directories = directoryInfo.GetDirectories();
+            foreach (DirectoryInfo directory in directories)
+            {
+                Node directoryNode = ReadDirectory(directory.FullName);
+                container.Add(directoryNode);
+            }
+
+            return container;
+        }
     }
 }