Stricter checks on file MIME type

mattpass · mattpass · commit 3751ea54993c · 2021-06-26T22:48:18.000+01:00
diff --git a/lib/indexer.php b/lib/indexer.php
@@ -53,12 +53,12 @@ function phpGrep($path, $base) {
                 continue;
             }
             $finfo = "text";
-            // Must have a MIME type string starting with "text"
+            // Must have a MIME type string starting with "text" (also avoids "empty" files)
             if (function_exists('finfo_open')) {
                 $finfoMIME = finfo_open(FILEINFO_MIME);
                 $finfo = finfo_file($finfoMIME, $filePath);
             }
-            if (strpos($finfo, "text")) {
+            if (0 !== strpos($finfo, "text")) {
                 continue;
             }
             // Check if file appears to be the same (same size and mtime), if so, continue as we'll assume it's not changed

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,12 @@ function phpGrep($path, $base) {`
`53`	`53`	`continue;`
`54`	`54`	`}`
`55`	`55`	`$finfo = "text";`
`56`		`- // Must have a MIME type string starting with "text"`
	`56`	`+ // Must have a MIME type string starting with "text" (also avoids "empty" files)`
`57`	`57`	`if (function_exists('finfo_open')) {`
`58`	`58`	`$finfoMIME = finfo_open(FILEINFO_MIME);`
`59`	`59`	`$finfo = finfo_file($finfoMIME, $filePath);`
`60`	`60`	`}`
`61`		`- if (strpos($finfo, "text")) {`
	`61`	`+ if (0 !== strpos($finfo, "text")) {`
`62`	`62`	`continue;`
`63`	`63`	`}`
`64`	`64`	`// Check if file appears to be the same (same size and mtime), if so, continue as we'll assume it's not changed`