Commit Graph

36 Commits

Author SHA1 Message Date
Mikko Koppanen
1e6695feb7 spprintf the dbname
use VCWD_ACCESS instead of access
2009-12-27 00:43:33 +00:00
Mikko Koppanen
1496161f01 Upgrade bundled libmagic to 5.03 (fixes CDF parsing related issues)
Clean up / remove whitespace differences to make next merge easier
Removed unnecessary files from trunk
2009-12-26 15:00:21 +00:00
Pierre Joye
e0b392f028 - fix #49732, fix crash when timestamp conversion fails 2009-10-01 13:55:16 +00:00
Pierre Joye
68a3c3f952 - add license 2009-06-26 07:24:41 +00:00
Felipe Pena
219c2603bb - MFH: Fixed bug #48578 (Can't build 5.3 on FBSD 4.11) (Rasmus) 2009-06-17 16:20:04 +00:00
Scott MacVicar
2d183dcc1d MFH Update bundled libmagic to 5.03 2009-05-09 20:34:37 +00:00
Scott MacVicar
c3b88aec15 MFH Update libmagic to 5.02 2009-05-04 20:54:53 +00:00
Pierre Joye
8e202b40a0 - fix the build for win (vc6 or vc9)
- fix logic in time convertion
- force shared on windows, will fix the dirent issue later (no, it is not enough to simply remove the dep or header include)
- add myself before I forget again
2009-03-16 15:03:06 +00:00
Ilia Alshanetsky
ea27fd2ba3 Fixed compiler warnings 2009-03-16 12:52:39 +00:00
Scott MacVicar
7a29c8f386 MFH Update fileinfo to libmagic 5.00 and remove dependency on dirent.h on Windows 2009-03-15 23:04:19 +00:00
Andrei Zmievski
d7b6f0103b memset() requires a pointer. 2009-01-12 19:09:34 +00:00
Scott MacVicar
ceabdbb483 MFH Add asprintf, use regular system malloc and free and add checks in configure.in for the functions 2008-11-27 19:45:27 +00:00
Scott MacVicar
3a93ef37c4 MFH Warnings from libmagic should be notices rather than sent to stderr, this fixes a test on Windows 2008-11-22 10:29:05 +00:00
Scott MacVicar
a94ac5d436 MFH: Fix buffer overread in libmagic and sync a skipped change from 4.26 2008-11-06 03:00:04 +00:00
Scott MacVicar
3e543f2464 MFH: Sync libmagic with 4.26 and add support for the new v6 magic file format 2008-11-02 16:13:49 +00:00
Scott MacVicar
a8c8963bc0 MFH: Fix a stat on a null when the internal database is used. 2008-10-22 16:34:40 +00:00
Scott MacVicar
a6ec097f68 MFH: When using the internal database and there is an error it could try free some invalid things. This was causing a bus error on ppc. 2008-10-22 14:15:47 +00:00
Scott MacVicar
55a965f793 MFH Fix bug #46331 - The internal magic db is const memory and segfaults when you try to do byte swapping
on big endian machines. This fixes it by copying the memory for those processors, but this isn't ideal as
it wastes memory. Perhaps using a static cache would be better.
2008-10-20 23:36:14 +00:00
Pierre Joye
144527b190 - support for VC6 and some other platforms (before some other cleanup) 2008-10-20 14:45:59 +00:00
Ilia Alshanetsky
5a28412ad2 Removed dead-code 2008-10-15 22:56:57 +00:00
Derick Rethans
bac72c6052 - MFH: Fixed mime-type generation.
#- Charset markers need to be prepended with ; -- the tests were also wrong.
2008-10-08 09:44:24 +00:00
Felipe Pena
516ac7e726 - MFH: Fixed bug #46071 (finfo_open() segfaults with wrong file name on BSD) 2008-09-16 22:25:52 +00:00
Ilia Alshanetsky
a6860ce964 Removed unused variables 2008-09-06 21:31:01 +00:00
Felipe Pena
5b0e87618b - Silent valgrind 2008-09-02 12:43:24 +00:00
Pierre Joye
c8a0c3b0f5 - don't close caller streams in libmagic (prevent leak and zombie stream)
- string returned by magic_* are freed on magic_close, duplicate before
  calling magic_close (set return value)
- if stat failed, don't try to call magic_* (when FILEINFO_MODE_FILE)
2008-09-02 10:15:54 +00:00
Pierre Joye
99041160df - use php's stream in libmagic
- remove duplicate code (like mime_content_type() compatibility function
  now use the same base as finfo_file())
- make it portable (works now on windows too, belongs other OSes)

- ([20:28]  <lsmith> Pierre: ok please commit)
2008-09-01 18:56:06 +00:00
Derick Rethans
6fbf14c544 - MFH: Some more cleanups, and fixed some warnings. 2008-08-29 12:05:46 +00:00
Antony Dovgal
c7c4d96c73 fix invalid read 2008-08-29 10:53:13 +00:00
Antony Dovgal
f6e15a25da fix ZTS build 2008-08-29 10:12:29 +00:00
Scott MacVicar
4690692519 Replace ereg code with pcre, fix duplicate macro names and segfault. Patch by Mikko 2008-08-29 09:49:01 +00:00
Felipe Pena
1ef7dfce3d - MFH: Fixed crash in file_error_core() 2008-08-27 00:17:27 +00:00
Ilia Alshanetsky
b805c7f8b7 Upgraded the lib to use PHP memory allocation routines.
Fixed a crash caused by analysis of DEADJOE files
A little bit of CS inside libmagic
2008-08-26 12:23:29 +00:00
Antony Dovgal
273ebb45c9 MFH 2008-08-10 19:48:54 +00:00
Scott MacVicar
97400c6cd3 MFH: get fileinfo building again on Windows 2008-07-31 00:33:02 +00:00
SVN Migration
7b0f90e0c8 This commit was manufactured by cvs2svn to create branch 'PHP_5_3'. 2008-07-25 08:18:35 +00:00
SVN Migration
14ce4a1d0a This commit was manufactured by cvs2svn to create branch 'PHP_5_3'. 2008-07-25 02:44:58 +00:00