summaryrefslogtreecommitdiff
path: root/ext/fileinfo
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into testDmitry Stogov2014-08-114-12/+110
|\
| * Fix bug #67705 (extensive backtracking in rule regular expression)Stanislav Malyshev2014-08-044-13/+109
* | Partial fix that allows internal constructors to set $this to null.Dmitry Stogov2014-07-091-0/+1
* | Merge branch 'master' into testDmitry Stogov2014-07-071-27/+296
|\ \ | |/
| * updated libmagic.patch in 5.6+Anatol Belski2014-07-011-27/+296
* | Merge branch 'master' into phpngDmitry Stogov2014-06-122-9/+24
|\ \ | |/
| * Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-101-1/+5
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-101-1/+5
| | |\
| | | * Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary checRemi Collet2014-06-101-1/+5
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-101-3/+4
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-101-3/+4
| | |\ \ | | | |/
| | | * Bug #67412 fileinfo: cdf_count_chain insufficient boundary checkRemi Collet2014-06-101-3/+4
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-101-2/+4
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-101-2/+4
| | |\ \ | | | |/
| | | * Fixed Bug #67411 fileinfo: cdf_check_stream_offset insufficient boundary checkRemi Collet2014-06-101-2/+4
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-101-3/+11
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-101-3/+11
| | |\ \ | | | |/
| | | * Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal st...Remi Collet2014-06-101-3/+11
* | | | Merge branch 'master' into phpngDmitry Stogov2014-06-053-21/+70
|\ \ \ \ | |/ / /
| * | | Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain ...Anatol Belski2014-06-033-19/+68
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-031-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-031-2/+2
| | |\ \ | | | |/
| | | * Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary checkRemi Collet2014-06-031-2/+2
| | * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-05-271-4/+60
| | |\ \ | | | |/
| | | * updated libmagic.patch for 5.4+Anatol Belski2014-05-271-66/+138
| | | * backport this piece from 5.6, related to the #66307 fixAnatol Belski2014-05-261-1/+2
| | | * Fixed bug #66307 Fileinfo crashes with powerpoint filesAnatol Belski2014-05-263-2/+7
* | | | Merge branch 'master' into phpngXinchen Hui2014-06-012-19/+73
|\ \ \ \ | |/ / /
| * | | updated libmagic.patch for 5.6+Anatol Belski2014-05-271-6/+62
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-261-13/+11
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-05-261-13/+11
| | |\ \ | | | |/
| | | * Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance...Stanislav Malyshev2014-05-261-12/+4
| | | * Fix bug #67327: fileinfo: CDF infinite loop in nelements DoSStanislav Malyshev2014-05-261-1/+7
| | * | updated libmagic.patchAnatol Belski2014-04-241-63/+79
| | * | backport this piece from 5.6, related to the #66307 fixAnatol Belski2014-04-241-1/+2
* | | | Fixed ext/fileinfo conversion mistakesDmitry Stogov2014-05-071-14/+29
* | | | Refactor fileinfoXinchen Hui2014-05-073-208/+145
|/ / /
* | | updated libmagic.patchAnatol Belski2014-05-041-0/+12
* | | added missing stdint header, bug #66907Anatol Belski2014-05-041-0/+2
* | | updated libmagic.patch for 5.6+Anatol Belski2014-04-241-4/+12
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-04-243-1/+5
|\ \ \ | |/ /
| * | Fixed bug #66307 Fileinfo crashes with powerpoint filesAnatol Belski2014-04-243-2/+7
* | | Fixed bug #66907 Solaris 10 is missing strcasestr and needs substituteAnatol Belski2014-04-152-0/+117
* | | updated libmagic.patchAnatol Belski2014-03-311-53/+57
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-03-311-6/+8
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-311-6/+8
| |\ \ | | |/
| | * Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)Remi Collet2014-03-311-6/+8
* | | fix merge issueRemi Collet2014-03-251-1000000/+175247
* | | Fix merge (5.6 already have file 5.17)Remi Collet2014-03-252-175247/+1000004
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-03-252-7136/+7175
| |\ \ | | |/