[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic apprentice.c

[Felipe Pena]

felipe          Tue Sep 16 22:25:53 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/fileinfo/libmagic      apprentice.c 
  Log:
  - MFH: 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.7.2.5&r2=1.7.2.6&diff_format=u
Index: php-src/ext/fileinfo/libmagic/apprentice.c
diff -u php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.5 
php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.6
--- php-src/ext/fileinfo/libmagic/apprentice.c:1.7.2.5  Tue Sep  2 12:43:24 2008
+++ php-src/ext/fileinfo/libmagic/apprentice.c  Tue Sep 16 22:25:52 2008
@@ -1901,7 +1901,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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php