Validate Mach-O headers before full reads

lib/macho/fat_file.rb

@@ -96,7 +96,12 @@ def initialize(filename, **opts)
 
       @filename = filename
       @options = opts
-      @raw_data = File.binread(@filename)
+      File.open(@filename, "rb") do |file|
+        @raw_data = file.read(Headers::FatHeader.bytesize)
+        @raw_data ||= ""
+        populate_fat_header
+        @raw_data << file.read.to_s
+      end
       populate_fields
     end
 

lib/macho/macho_file.rb

@@ -60,7 +60,12 @@ def initialize(filename, **opts)
 
       @filename = filename
       @options = opts
-      @raw_data = File.binread(@filename)
+      File.open(@filename, "rb") do |file|
+        @raw_data = file.read(Headers::MachHeader.bytesize)
+        @raw_data ||= ""
+        populate_mach_header if !opts.fetch(:decompress, false) || !Utils.compressed_magic?(@raw_data.unpack1("N"))
+        @raw_data << file.read.to_s
+      end
       populate_fields
     end
 

test/test_fat.rb

@@ -36,6 +36,20 @@ def test_java_classfile
     end
   end
 
+  def test_invalid_header_is_rejected_before_full_read
+    tempfile_with_data("invalid_header", [MachO::Headers::FAT_MAGIC, 31].pack("N2") + ("x" * 1024)) do |invalid_header|
+      assert_raises MachO::JavaClassFileError do
+        Class.new(MachO::FatFile) do
+          def populate_fat_header
+            raise "read entire file" if serialize.bytesize > MachO::Headers::FatHeader.bytesize
+
+            super
+          end
+        end.new(invalid_header.path)
+      end
+    end
+  end
+
   def test_zero_arch_file
     assert_raises MachO::ZeroArchitectureError do
       MachO::FatFile.new("test/bin/llvm/macho-invalid-fat-header")

test/test_macho.rb

@@ -27,6 +27,20 @@ def test_truncated_file
     end
   end
 
+  def test_invalid_header_is_rejected_before_full_read
+    tempfile_with_data("invalid_header", [MachO::Headers::MH_MAGIC, 0, 0, MachO::Headers::MH_EXECUTE, 0, 0, 0].pack("N7") + ("x" * 1024)) do |invalid_header|
+      assert_raises MachO::CPUTypeError do
+        Class.new(MachO::MachOFile) do
+          def populate_mach_header
+            raise "read entire file" if serialize.bytesize > MachO::Headers::MachHeader.bytesize
+
+            super
+          end
+        end.new(invalid_header.path)
+      end
+    end
+  end
+
   def test_load_commands
     filenames = SINGLE_ARCHES.map { |a| fixture(a, "hello.bin") }