Merge pull request gabriel-vasile#34 from AntoineGirard/fix-dbf-matcher

Prevent bad .dbf file
fahadsiddiqui · Jun 17, 2019 · 8e178e3 · 8e178e3
2 parents 4a466b0 + 2186a11
commit 8e178e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/internal/matchers/binary.go b/internal/matchers/binary.go
@@ -25,6 +25,10 @@ func Wasm(in []byte) bool {
 // Dbf matches a dBase file.
 // https://www.dbase.com/Knowledgebase/INT/db7_file_fmt.htm
 func Dbf(in []byte) bool {
+ if len(in) < 4 {
+ return false
+ }
+
  // 3rd and 4th bytes contain the last update month and day of month
  if !(0 < in[2] && in[2] < 13 && 0 < in[3] && in[3] < 32) {
  return false

diff --git a/mime_test.go b/mime_test.go
@@ -190,6 +190,12 @@ func TestEmptyInput(t *testing.T) {
  }
 }
 
+func TestBadBdfInput(t *testing.T) {
+ if m, _, _ := DetectFile("testdata/bad.dbf"); m != "application/octet-stream" {
+ t.Errorf("failed to detect bad DBF file")
+ }
+}
+
 func TestGenerateSupportedMimesFile(t *testing.T) {
  f, err := os.OpenFile("supported_mimes.md", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
  if err != nil {

diff --git a/testdata/bad.dbf b/testdata/bad.dbf