format_parser 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c1744492b66a28cf9ff258a894c28f74552eb560794e74bb2ab9c06801f0be
-  data.tar.gz: 7f92fb35cd4b18992879b6a37799c479452f83f67e5535bc92711a26af0bcc02
+  metadata.gz: 9387f32c6af3a32839c958afe0fb79352e7a19e99edef5d6fc33dc2102c0d403
+  data.tar.gz: c78134703d9c6cf6e243dadeab0962e3c84a6f20d1ad42f5d52dbd66f2e8b610
 SHA512:
-  metadata.gz: b45536df47aaf92fd28c4d32bc5ce67bf66cda6d1079f1212e4a7f21fa90b998938adb0e619251a30a65637e04f6de372a6bb545cc856bd7f3fcf36a82a87caa
-  data.tar.gz: f7604ed45d27c6316d2dcf78df2dae6ec6bebe405cc20639e0b5364f1c0018c4b3f9e621ebeb93d198f8472f293f436a40958312e1d2d1c9b0cdb8530a05b159
+  metadata.gz: 5e710c21e98deb50e6e88a8ba6f46254cb2224a9cfff618637b9380071e1f3a77029e3a024e46a6d4d45f1c6987a2638cb78b7f3aacc3dbcd55fc3308fe5a8f9
+  data.tar.gz: '0858b0406ae6461ee63e961e3017eab71616779f29774e887eed7646e7f67db40711a1a3dd72d22665dd17dbd4131e9b7e8cbce0a5943a64d708a5b4bc25e468'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.13.2
+* Handle BMP files with pixel array offsets larger than 54
+
 ## 0.13.1
 * Avoid ZIP checks in the JPEG parser which are no longer necessary
 

data/lib/format_parser/version.rb

@@ -1,3 +1,3 @@
 module FormatParser
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end

data/lib/parsers/bmp_parser.rb

@@ -4,14 +4,17 @@ class FormatParser::BMPParser
   include FormatParser::IOUtils
 
   VALID_BMP = 'BM'
-  PIXEL_ARRAY_OFFSET = 54
+  PERMISSIBLE_PIXEL_ARRAY_LOCATIONS = 40..512
 
   def call(io)
     io = FormatParser::IOConstraint.new(io)
 
-    magic_number, _file_size, _reserved1, _reserved2, dib_header_location = safe_read(io, 14).unpack('A2Vv2V')
+    magic_number, _file_size, _reserved1, _reserved2, pix_array_location = safe_read(io, 14).unpack('A2Vv2V')
     return unless VALID_BMP == magic_number
-    return unless dib_header_location == PIXEL_ARRAY_OFFSET
+
+    # The number that gets unpacked can be fairly large, but in practice this offset cannot be too big -
+    # the DIB image header won't be that big anyway/
+    return unless PERMISSIBLE_PIXEL_ARRAY_LOCATIONS.cover?(pix_array_location)
 
     dib_header = safe_read(io, 40)
 

data/spec/parsers/bmp_parser_spec.rb

@@ -36,4 +36,34 @@ describe FormatParser::BMPParser do
     expect(parsed.intrinsics[:horizontal_resolution]).to eq(2835)
     expect(parsed.intrinsics[:data_order]).to eq(:inverse)
   end
+
+  it 'parses a BMP where the pixel array location is other than 54' do
+    bmp_path = fixtures_dir + '/BMP/offset_pixarray.bmp'
+    parsed = subject.call(File.open(bmp_path, 'rb'))
+
+    expect(parsed).not_to be_nil
+    expect(parsed.nature).to eq(:image)
+    expect(parsed.format).to eq(:bmp)
+    expect(parsed.color_mode).to eq(:rgb)
+
+    expect(parsed.width_px).to eq(200)
+    expect(parsed.height_px).to eq(200)
+
+    expect(parsed.intrinsics).not_to be_nil
+  end
+
+  it 'refuses to parse a BMP where the pixel array location is very large' do
+    junk_data = [
+      'BM',
+      123,
+      123,
+      123,
+      0xFFFF
+    ].pack('A2Vv2V')
+    not_bmp = StringIO.new(junk_data + Random.new.bytes(1024))
+
+    parsed = subject.call(not_bmp)
+
+    expect(parsed).to be_nil
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: format_parser
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Noah Berman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ks