archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 17:34:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
121832 commits 526 branches 1434 tags 882 MiB
Commit graph

89 commits

Author SHA1 Message Date
Anatol Belski
967a6771d3 updated to libmagic-5.17 2014-02-19 10:02:36 +01:00
Anatol Belski
cdc1a63790 Fixed bug bug #64713 Compilation warnings in finfo 2013-04-27 13:49:50 +02:00
Anatol Belski
9de5dcad1c fix ident 2013-04-08 15:51:22 +02:00
Anatol Belski
f3ca1155d6 Refactored the previous memleak fix 
to avoid usage of a freed pointer. Thanks Laruence )
 2013-04-08 14:32:37 +02:00
Anatol Belski
28e26b0fad fix memory leak at apprentice.c:1095 2013-04-08 12:49:53 +02:00
Anatol Belski
b0b81c0a37 fixed EOL 2013-04-08 09:20:43 +02:00
Anatol Belski
10367fa7c6 upgraded libmagic to 5.14 2013-04-07 22:15:56 +02:00
Anatoliy Belsky
d88017e992 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
	NEWS
	ext/fileinfo/libmagic.patch
	ext/fileinfo/tests/finfo_open_error-win32.phpt
 2012-11-27 16:45:25 +01:00
Anatoliy Belsky
e6b727d3b7 Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows 2012-11-27 16:33:58 +01:00
Anatoliy Belsky
8a84b1b5d9 Backported the fix for bug #63248 from 5.4+ 2012-11-23 13:58:22 +01:00
Xinchen Hui
0d7965f0a3 Merge the fix for #61964 to 5.3, which will fix #63304 2012-10-18 23:29:33 +08:00
Anatoliy Belsky
6d019deee2 Fixed bug #63248 Load multiple magic files on win 
- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams
 2012-10-16 11:03:32 +02:00
Xinchen Hui
328a3d9f13 regenerate patch, and save a strlen 2012-09-11 11:43:47 +08:00
Xinchen Hui
0a25a0241e Fix the wrong use of snprintf which is introduced in 1d2f619049 2012-09-10 23:08:54 +08:00
Reeze Xia
1d2f619049 Fixed bug #61964 (finfo_open with directory cause invalid free) 2012-05-25 18:55:34 +08:00
Pierre Joye
12cf930a40 Fix bug #61504, potential vuln. in fileinfo. update to 5.11 2012-03-27 13:34:46 +02:00
Felipe Pena
72ad61733a - Fix the fix 2011-11-22 15:12:44 +00:00
Felipe Pena
8a4d75fe85 - Fixed possible memory leak in finfo_open() 2011-11-22 15:04:19 +00:00
Felipe Pena
490b75d170 - Fixed bug #54934 (Unresolved symbol strtoull in HP-UX 11.11) 2011-05-27 23:31:30 +00:00
Kalle Sommer Nielsen
cb30330800 Merge safe_mode changes into extensions that are in sync in both branches 2010-04-26 23:55:03 +00:00
Felipe Pena
0d5a318090 - Fixed ZTS build 2009-12-27 18:13:37 +00:00
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
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
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
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
Felipe Pena
516ac7e726 - MFH: Fixed bug #46071 (finfo_open() segfaults with wrong file name on BSD) 2008-09-16 22:25:52 +00:00
Felipe Pena
5b0e87618b - Silent valgrind 2008-09-02 12:43:24 +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
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
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
SVN Migration
7b0f90e0c8 This commit was manufactured by cvs2svn to create branch 'PHP_5_3'. 2008-07-25 08:18:35 +00:00