php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
79,344 Commits 549 Branches 1,486 Tags
f3f22ff5c697aef854ffc1918bce708b37481b0f
Commit Graph

33894 Commits

Author SHA1 Message Date
Anatol Belski f3f22ff5c6 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files 2014-06-03 11:37:20 +02:00
Remi Collet e61f7727d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:29 +02:00
Remi Collet 2d59b87527 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
 2014-06-03 11:09:04 +02:00
Remi Collet 4fcb9a9d1b Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check 
Upstream fix https://github.com/file/file/commit/6d209c1c489457397a5763bca4b28e43aac90391.patch
Only revelant part applied
 2014-06-03 11:05:00 +02:00
Xinchen Hui c4e7c7d50e Merge branch 'PHP-5.5' into PHP-5.6 2014-06-01 19:42:20 +08:00
Xinchen Hui 9bb5867fad Merge branch 'PHP-5.4' into PHP-5.5 2014-06-01 19:41:35 +08:00
Xinchen Hui 38be99b739 Fixed bug #67359 (Segfault in recursiveDirectoryIterator) 2014-06-01 19:41:01 +08:00
Adam Harvey b8042acdde Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
 2014-05-29 17:56:32 +00:00
Adam Harvey 43e3a83d51 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
 2014-05-29 17:53:28 +00:00
Adam Harvey b5d9983ff4 Check for zero-length keys in spl_array_skip_protected and don't skip them. 
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
 2014-05-29 17:49:32 +00:00
Anatol Belski fb991bd7fd updated libmagic.patch for 5.6+ 2014-05-27 22:39:54 +02:00
Anatol Belski 546797f329 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch for 5.4+

Conflicts:
	ext/fileinfo/libmagic.patch
 2014-05-27 22:38:02 +02:00
Anatol Belski d2765e4b8c updated libmagic.patch for 5.4+ 2014-05-27 22:36:12 +02:00
Stanislav Malyshev 13a3826687 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date
 2014-05-27 12:11:59 -07:00
Stanislav Malyshev a2f8c9c1ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
 2014-05-27 12:10:41 -07:00
Stanislav Malyshev 091b7642c2 Fix bug #67249: printf out-of-bounds read 2014-05-27 11:28:22 -07:00
Andrew Kehrig 91e7b3b84f Fix #50444: PDO-ODBC changes for 64-bit 
This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
 2014-05-26 22:17:29 -07:00
Stanislav Malyshev bc87ba8ee6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
  fix my last commit with some locales
 2014-05-26 18:06:58 -07:00
Anatol Belski d184f07b3c backport this piece from 5.6, related to the #66307 fix 2014-05-26 18:05:13 -07:00
Anatol Belski 15ee33eb21 Fixed bug #66307 Fileinfo crashes with powerpoint files 2014-05-26 18:04:27 -07:00
Stanislav Malyshev 5ce11c2698 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
 2014-05-26 18:03:01 -07:00
Stanislav Malyshev 4005f06df6 Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation) 
Upstream patch: https://github.com/file/file/commit/b8acc83781d5a24cc5101e525d15efe0482c280d
 2014-05-26 18:01:17 -07:00
Stanislav Malyshev 57225f09ed Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS 
Upstream fix: https://github.com/file/file/commit/f97486ef5dc3e8735440edc4fc8808c63e1a3ef0
 2014-05-26 17:45:14 -07:00
Xinchen Hui b0b0be176f Merge branch 'PHP-5.5' into PHP-5.6 2014-05-26 15:40:50 +08:00
Xinchen Hui 70699d7f68 Update NEWs and add a test 2014-05-26 15:40:26 +08:00
Dmitry Stogov 24a86dbb6f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed issue #183 (TMP_VAR is not only used once)
 2014-05-26 10:12:10 +04:00
Dmitry Stogov 19be8b676c Fixed issue #183 (TMP_VAR is not only used once) 2014-05-26 10:10:59 +04:00
Adam Harvey 80a2716b56 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
 2014-05-23 15:23:15 +00:00
Adam Harvey 2260fca3dd Further test fixes for the fdb2709 breakage. 2014-05-23 15:22:26 +00:00
Adam Harvey 6d9cc92238 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix broken test caused by fdb2709.

Conflicts:
	ext/intl/tests/dateformat_format.phpt
 2014-05-23 15:14:00 +00:00
Adam Harvey 319611ffbd Fix broken test caused by fdb2709. 2014-05-23 15:07:19 +00:00
Adam Harvey 549331a925 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:05:08 -05:00
Adam Harvey d39377924c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add microseconds to the serialised form of DateTime objects.
 2014-05-21 15:03:24 -05:00
Adam Harvey fdb2709dd2 Add microseconds to the serialised form of DateTime objects. 
Fixes bug #67308 (Serialize of DateTime truncates fractions of second).
 2014-05-21 14:55:52 -05:00
Matteo Beccati b41ad9bfcb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improved test for bug #62479
 2014-05-21 18:59:14 +02:00
Matteo Beccati 69d4a0b8d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved test for bug #62479
 2014-05-21 18:59:02 +02:00
Matteo Beccati 00a22d4d06 Improved test for bug #62479 2014-05-21 18:58:14 +02:00
Dmitry Stogov 1d1fdfb51d Support for __debugInfo (Joe Watkins) 2014-05-18 20:55:40 +04:00
Dmitry Stogov 3fff53fc57 Optimize ZEND_POW (Rouven Weßling) 2014-05-18 20:48:16 +04:00
Tjerk Meesters d4295eb26a Prevent recursion in ZF2 Parameters class 2014-05-16 16:49:47 +08:00
Stanislav Malyshev 292b2fd3b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
 2014-05-13 17:03:50 -07:00
Stanislav Malyshev a03a1ab88c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
 2014-05-13 17:02:09 -07:00
Stanislav Malyshev dc92e81922 Merge branch 'bug67251' into PHP-5.4 
* bug67251:
  Fix bug #67251 - date_parse_from_format out-of-bounds read

Conflicts:
	ext/date/lib/parse_date.c
 2014-05-13 16:52:45 -07:00
Stanislav Malyshev 0094fd0969 Merge branch 'bug67252' into PHP-5.4 
* bug67252:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
 2014-05-13 16:47:27 -07:00
Stanislav Malyshev 9103c9eb4f Merge branch 'bug67250' into PHP-5.4 
* bug67250:
  Fix bug #67250 (iptcparse out-of-bounds read)
 2014-05-13 16:43:10 -07:00
Derick Rethans db42f83c2e Merge branch 'PHP-5.5' into PHP-5.6 2014-05-13 16:37:05 +01:00
Derick Rethans e3a48b3a43 Merge branch 'PHP-5.4' into PHP-5.5 2014-05-13 16:36:59 +01:00
Derick Rethans 3e276d6728 - Updated to version 2014.3 (2014c) 2014-05-13 16:36:58 +01:00
Stanislav Malyshev 2152e2f127 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test - output can be chunked

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
 2014-05-12 10:56:03 -07:00
Stanislav Malyshev e3ca87265d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test - output can be chunked
 2014-05-12 10:54:34 -07:00