cvs: php-src /ext/fileinfo/libmagic apprentice.c
| From: | Felipe Pena | Date: | Tue, 16 Sep 2008 22:21:40 +0000 |
| Subject: | cvs: php-src /ext/fileinfo/libmagic apprentice.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53184@lists.php.net to get a copy of this message | ||
felipe Tue Sep 16 22:21:40 2008 UTC
Modified files:
/php-src/ext/fileinfo/libmagic apprentice.c
Log:
- Fixed bug #46071 (finfo_open() segfaults with wrong file name on BSD)
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/apprentice.c?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.11
php-src/ext/fileinfo/libmagic/apprentice.c:1.12
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.11 Sun Sep 7 20:29:54 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c Tue Sep 16 22:21:40 2008
@@ -1899,7 +1899,7 @@
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;