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
e10b18693c
MFH fileinfo tests are missing skipif
2009-03-15 23:17:28 +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
372256b002
MFH Remove all of the stuff we have in here for pre PHP 5.2 support and memset the fileinfo struct.
2008-12-22 16:45:07 +00:00
Derick Rethans
9d1eca8ee1
*** empty log message ***
2008-12-04 14:55:19 +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
Felipe Pena
fc2fb50d09
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-11-17 11:28:01 +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
Felipe Pena
7a37fa2d6b
- Revert ZEND_BEGIN_ARG_INFO change
2008-11-02 21:19:39 +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
Felipe Pena
df10005563
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
2008-10-24 14:35:40 +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
Antony Dovgal
02022c766c
MFH: fix compile warning
2008-09-16 09:48:17 +00:00
Scott MacVicar
3940782c25
MFH: Fix memory leak in a few cases
2008-09-16 09:46:24 +00:00
Scott MacVicar
b845244370
Missed variable declaration.
2008-09-15 22:16:25 +00:00
Scott MacVicar
db907e5bc3
Fixed bug #46086 (Segfault when accessing fileinfo class property)
2008-09-15 22:13:25 +00:00
Felix De Vliegher
7251de9eb8
MFH: More fileinfo tests.
2008-09-15 08:51:43 +00:00
Antony Dovgal
8209f891a4
MFH
2008-09-13 21:32:21 +00:00
Ilia Alshanetsky
a6860ce964
Removed unused variables
2008-09-06 21:31:01 +00:00
Felipe Pena
11319aa113
- New test
2008-09-02 19:28:21 +00:00
Felipe Pena
5b0e87618b
- Silent valgrind
2008-09-02 12:43:24 +00:00
Pierre Joye
ed4db08f69
- fix test (file or path not found) (Thanks Dmitry for the notice)
2008-09-02 10:28:11 +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
Felipe Pena
d13b704d25
- Fixed mime_content_type() behavior when a string is given
...
- Fixed check for "empty file name"
- MFH: New test
2008-09-01 23:44:00 +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
Felipe Pena
9566ebabcb
- Fixed tests (Disable COMPRESS support for now)
2008-08-29 15:28:45 +00:00
Antony Dovgal
fa978e8595
MFH: check for \0 to be consistent with other functions
2008-08-29 13:48:38 +00:00
Derick Rethans
057b2401bf
- Disable COMPRESS support for now, as it requires forking.
...
# @DOC [DOC] "DOC"
2008-08-29 13:39:01 +00:00
Derick Rethans
4ca7e129a7
- MFH: Adding back in mime_content_type().
2008-08-29 13:29:42 +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
Felix De Vliegher
ef8ae4dfc5
Some fileinfo tests
2008-08-29 10:29:55 +00:00
Antony Dovgal
f6e15a25da
fix ZTS build
2008-08-29 10:12:29 +00:00
Scott MacVicar
907c24fd81
Test for fileinfo to check mime types.
2008-08-29 09:52:13 +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
Antony Dovgal
3bd40d9000
fix file check and avoid segfault
2008-08-27 07:40:44 +00:00
Felipe Pena
7208556ca4
- MFH: Fixed check for empty file name
2008-08-27 01:04:23 +00:00
Felipe Pena
1ef7dfce3d
- MFH: Fixed crash in file_error_core()
2008-08-27 00:17:27 +00:00
Felipe Pena
d8c43bde79
- MFH: Improved fix
2008-08-26 16:22:27 +00:00
Felipe Pena
727990f432
- MFH: Added check for empty file name
2008-08-26 15:06:28 +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
