Merge pull request #84 from 0xced/machO-shouldOwnStream

Fix shouldOwnStream argument of MachO instances
konrad-kruczynski · Apr 7, 2022 · 8255a90 · 8255a90
2 parents 4e3ccb6 + 6de944f
commit 8255a90
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 1 deletion.
diff --git a/ELFSharp/MachO/MachO.cs b/ELFSharp/MachO/MachO.cs
@@ -11,7 +11,7 @@ internal MachO(Stream stream, bool is64, Endianess endianess, bool ownsStream)
         {
             this.is64 = is64;
 
-            using var reader = new SimpleEndianessAwareReader(stream, endianess, ownsStream);
+            using var reader = new SimpleEndianessAwareReader(stream, endianess, !ownsStream);
 
             Machine = (Machine)reader.ReadInt32();
             reader.ReadBytes(4); // we don't support the cpu subtype now

diff --git a/Tests/ELF/OpeningTests.cs b/Tests/ELF/OpeningTests.cs
@@ -105,6 +105,24 @@ public void ShouldOpenEmptyStringTableElf()
             var section = elf.GetSection(".dynstr");
             Assert.AreEqual(SectionType.NoBits, section.Type);
         }
+
+        [Test]
+        public void ShouldDisposeStream()
+        {
+            var isDisposed = false;
+            var stream = new StreamWrapper(Utilities.GetBinaryStream("hello32le"), () => isDisposed = true);
+            ELFReader.Load(stream, shouldOwnStream: true).Dispose();
+            Assert.True(isDisposed);
+        }
+
+        [Test]
+        public void ShouldNotDisposeStream()
+        {
+            var isDisposed = false;
+            var stream = new StreamWrapper(Utilities.GetBinaryStream("hello32le"), () => isDisposed = true);
+            ELFReader.Load(stream, shouldOwnStream: false).Dispose();
+            Assert.False(isDisposed);
+        }
     }
 }
 
diff --git a/Tests/MachO/OpeningTests.cs b/Tests/MachO/OpeningTests.cs
@@ -75,6 +75,24 @@ public void ShouldOpenMachOObjectFile()
             Assert.AreEqual(machO.FileType, FileType.Object);
             Assert.AreEqual(machO.GetCommandsOfType<Segment>().Count(), 1);
         }
+
+        [Test]
+        public void ShouldDisposeStream()
+        {
+            var isDisposed = false;
+            var stream = new StreamWrapper(Utilities.GetBinaryStream("simple-mach-o"), () => isDisposed = true);
+            MachOReader.Load(stream, shouldOwnStream: true);
+            Assert.True(isDisposed);
+        }
+
+        [Test]
+        public void ShouldNotDisposeStream()
+        {
+            var isDisposed = false;
+            var stream = new StreamWrapper(Utilities.GetBinaryStream("simple-mach-o"), () => isDisposed = true);
+            MachOReader.Load(stream, shouldOwnStream: false);
+            Assert.False(isDisposed);
+        }
     }
 }
 
diff --git a/Tests/StreamWrapper.cs b/Tests/StreamWrapper.cs
@@ -0,0 +1,47 @@
+using System;
+using System.IO;
+
+namespace Tests
+{
+    public class StreamWrapper : Stream
+    {
+        private readonly Stream stream;
+        private readonly Action onDispose;
+
+        public StreamWrapper(Stream stream, Action onDispose)
+        {
+            this.stream = stream;
+            this.onDispose = onDispose;
+        }
+
+        public override void Flush() => stream.Flush();
+
+        public override int Read(byte[] buffer, int offset, int count) => stream.Read(buffer, offset, count);
+
+        public override long Seek(long offset, SeekOrigin origin) => stream.Seek(offset, origin);
+
+        public override void SetLength(long value) => stream.SetLength(value);
+
+        public override void Write(byte[] buffer, int offset, int count) => stream.Write(buffer, offset, count);
+
+        public override bool CanRead => stream.CanRead;
+
+        public override bool CanSeek => stream.CanSeek;
+
+        public override bool CanWrite => stream.CanWrite;
+
+        public override long Length => stream.Length;
+
+        public override long Position
+        {
+            get => stream.Position;
+            set => stream.Position = value;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            onDispose();
+            base.Dispose(disposing);
+        }
+    }
+}