clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,855 Commits 491 Branches 1,363 Tags 846 MiB
d5831bfa12
Commit Graph

299 Commits

Author SHA1 Message Date
Xinchen Hui
9ef21b7606 Refactor fileinfo 2014-05-07 13:50:29 +08:00
Anatol Belski
06ae920165 updated libmagic.patch 2014-05-04 21:34:17 +02:00
Anatol Belski
031cafd4e2 added missing stdint header, bug #66907 2014-05-04 21:26:53 +02:00
Anatol Belski
5c34146104 updated libmagic.patch for 5.6+ 2014-04-24 20:16:06 +02:00
Anatol Belski
74ce9da5dc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
	ext/fileinfo/libmagic/readcdf.c
 2014-04-24 19:33:54 +02:00
Anatol Belski
03fa5501a8 Fixed bug #66307 Fileinfo crashes with powerpoint files 2014-04-24 19:30:34 +02:00
Anatol Belski
aaf197180a Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute 2014-04-15 10:26:49 -07:00
Anatol Belski
e265df460d updated libmagic.patch 2014-03-31 17:24:15 +02:00
Remi Collet
62305edc5b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
 2014-03-31 16:57:39 +02:00
Remi Collet
178eac6c98 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
 2014-03-31 16:57:12 +02:00
Remi Collet
2c204a55af Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian) 
On little endian:
	map->p == php_magic_database
	map->magic[i] = pointer into the map

	map->p == NULL
	map->magic[i] = pointer to allocated memory

On big endian (ppc64, s390x, ...):
	map->p != php_magic_database and map->p != NULL
        map->magic[i] = pointer into a copy of the map

Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.
 2014-03-31 16:50:47 +02:00
Remi Collet
5f0428e8cc fix merge issue 2014-03-25 12:07:15 +01:00
Remi Collet
64d7dd55d3 Fix merge (5.6 already have file 5.17) 2014-03-25 11:03:59 +01:00
Remi Collet
84b0ab6d8f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
 2014-03-25 11:01:20 +01:00
Remi Collet
4374a52e9d Fixed bug #66946 extensive backtracking in awk rule regular expression 
CVE-2013-7345

Applied upstream patch:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 11:00:33 +01:00
Remi Collet
1df558c6a0 Fixed bug #66946 extensive backtracking in awk rule regular expression 
CVE-2013-7345

Applied upstream patch:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 10:58:50 +01:00
Anatol Belski
62f6c5853f Fixes to various stream cast on win64 
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
 2014-03-19 06:33:46 +01:00
Anatol Belski
8bda4c685a updated libmagic.patch 2014-03-10 14:17:47 +01:00
Anatol Belski
6dd80946a2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libmagic.patch
 2014-03-10 14:14:01 +01:00
Anatol Belski
c17fd65165 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch
 2014-03-10 14:13:15 +01:00
Anatol Belski
b9d494a33b updated libmagic.patch 2014-03-10 14:12:20 +01:00
Remi Collet
9a9add6b73 fix merge 2014-03-04 20:39:00 +01:00
Remi Collet
5d08cae346 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
 2014-03-04 20:36:08 +01:00
Remi Collet
a33759fd27 Fixed Bug #66820 out-of-bounds memory access in fileinfo 
Upstream fix:
447558595a

Notice, test changed, with upstream agreement:
-define OFFSET_OOB(n, o, i)	((n) < (o) || (i) >= ((n) - (o)))
+define OFFSET_OOB(n, o, i)	((n) < (o) || (i) >  ((n) - (o)))
 2014-03-04 20:32:52 +01:00
Remi Collet
834b719cf5 fix merge 2014-03-04 13:46:21 +01:00
Remi Collet
bc0b6e02e4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improves fix for memory leak, keep in sync with upstream.
 2014-03-04 13:43:42 +01:00
Remi Collet
731013ee8e Improves fix for memory leak, keep in sync with upstream. 
Previous fix:
http://git.php.net/?p=php-src.git;a=commitdiff;h=10eb0070700382f966bf260e44135e1f724a15d2

Upstream fix:
c0c0032b9e
 2014-03-04 13:41:37 +01:00
Anatol Belski
b67c8b8603 updated libmagic.patch for 5.6+ 2014-02-20 19:05:59 +01:00
Anatol Belski
e244e2245b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch in 5.4/5
 2014-02-20 19:00:36 +01:00
Anatol Belski
ce1fd72776 updated libmagic.patch in 5.4/5 2014-02-20 19:00:05 +01:00
Anatol Belski
67d281f093 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed leak introduced after CVE/upgrade
 2014-02-20 18:55:05 +01:00
Anatol Belski
6d4d4155d2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed leak introduced after CVE/upgrade
 2014-02-20 18:54:35 +01:00
Anatol Belski
10eb007070 fixed leak introduced after CVE/upgrade 2014-02-20 18:53:53 +01:00
Anatol Belski
6b5c9f6c5a updated libmagic.patch 2014-02-19 11:20:24 +01:00
Anatol Belski
fdaf3996af remove PHP_API_VERSION < 20100412 check 2014-02-19 11:01:42 +01:00
Anatol Belski
6d2cf0f2a4 expose correct libmagic version 2014-02-19 10:48:52 +01:00
Anatol Belski
4019531748 fixed tests in ext/fileinfo 2014-02-19 10:04:29 +01:00
Anatol Belski
967a6771d3 updated to libmagic-5.17 2014-02-19 10:02:36 +01:00
Anatol Belski
e95a2925fc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated libmagic.patch
 2014-02-18 19:09:04 +01:00
Anatol Belski
8dd99dd2dc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch
 2014-02-18 19:08:45 +01:00
Anatol Belski
a289b37f48 updated libmagic.patch 2014-02-18 19:08:16 +01:00
Remi Collet
aa84d906d8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
  NEWS
  NEWS
  Fixed Bug #66731 file: infinite recursion
 2014-02-18 13:58:36 +01:00
Remi Collet
bd8cd98d6d Set fileinfo version to 1.0.5 (as in php 5.4, no diff) 2014-02-18 13:57:53 +01:00
Remi Collet
bdd65b578c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66731 file: infinite recursion
 2014-02-18 13:57:10 +01:00
Remi Collet
89f864c547 Fixed Bug #66731 file: infinite recursion 
Upstream commit (available in file-5.17)

3c081560c2
cc9e74dfec
 2014-02-18 13:54:33 +01:00
Lior Kaplan
23d952ed60 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-14 17:15:35 +02:00
Lior Kaplan
c09bd9def0 Merge branch 'PHP-5.4' into PHP-5.5 2014-02-14 15:30:00 +02:00
Veres Lajos
35101e9ef4 a few typofixes 2014-02-14 14:51:10 +02:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00