- MFH: Fixed bug #46071 (finfo_open() segfaults with wrong file name on BSD)

felipensp · felipensp · commit 516ac7e7269b · 2008-09-16T22:25:52.000Z
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
@@ -1901,7 +1901,7 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
 	ptr = (uint32_t *)(void *)*magicp;
 	if (*ptr != MAGICNO) {
 		if (swap4(*ptr) != MAGICNO) {
-			file_error(ms, 0, "bad magic in `%s'");
+			file_error(ms, 0, "bad magic in `%s'", dbname);
 			goto error1;
 		}
 		needsbyteswap = 1;

Original file line number	Diff line number	Diff line change
`@@ -1901,7 +1901,7 @@ apprentice_map(struct magic_set ms, struct magic magicp, uint32_t nmagicp,`
`1901`	`1901`	`ptr = (uint32_t )(void )*magicp;`
`1902`	`1902`	`if (*ptr != MAGICNO) {`
`1903`	`1903`	`if (swap4(*ptr) != MAGICNO) {`
`1904`		- file_error(ms, 0, "bad magic in `%s'");
	`1904`	+ file_error(ms, 0, "bad magic in `%s'", dbname);
`1905`	`1905`	`goto error1;`
`1906`	`1906`	`}`
`1907`	`1907`	`needsbyteswap = 1;`