1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

59 Commits

Author SHA1 Message Date
Stanislav Malyshev 91990bbde0 Merge branch 'PHP-5.5.33' into PHP-5.6.19
* PHP-5.5.33:
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize
2016-03-01 22:40:00 -08:00
Stanislav Malyshev a6fdc5bb27 Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile() 2016-02-21 16:51:05 -08:00
Lior Kaplan 49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Stanislav Malyshev 2e267bd3c7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
2015-09-28 21:42:08 -07:00
Stanislav Malyshev 1ddf72180a Better fix for bug #70433 2015-09-28 21:41:02 -07:00
Xinchen Hui 0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui 73c1be2653 Bump year 2015-01-15 23:26:03 +08: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
Xinchen Hui 63dba7ec9d Remove outdate codes, make it clearer, although just a bit.. 2013-11-05 18:47:12 +08:00
Nikita Popov db6d93feca Remove some more unnecessary macros from phar 2013-09-13 21:49:09 +02:00
Nikita Popov 39bd738fbf Remove version checks in phar
No need to keep around compatability code for PHP 5.0 and PHP 6.
2013-09-13 21:47:59 +02:00
Pierre Joye 3eb1745643 other fix for #64214, unmodified file may not have old fp set, causing other possible crashes 2013-05-17 11:45:13 +02:00
Pierre Joye ba1af29805 more check for php_stream_fopen_tmpfile failure 2013-05-14 16:45:11 +02:00
Pierre Joye 533e636a62 php_stream_fopen_tmpfile may file, causing any following stream usage to crash 2013-05-14 09:20:53 +02:00
Xinchen Hui bc11e6fdbb bump year 2013-01-06 10:19:09 +08:00
Felipe Pena 85fa4d7747 - Removed PHP 6 checks 2012-08-21 20:15:34 -03:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Johannes Schlüter c61d125986 - Handle error if tempfile can't be opened, found by parfait 2011-05-16 22:24:41 +00:00
Ilia Alshanetsky f4c468481a Fixed variable overloading 2011-01-20 19:32:36 +00:00
Felipe Pena 12d2104277 - Year++ 2011-01-01 02:48:19 +00:00
Ilia Alshanetsky 813e3cf14d Fixed bug #51690 (Phar::setStub looks for case-sensitive __HALT_COMPILER()) 2010-05-03 14:41:40 +00:00
Greg Beaver 732f4af082 re-organize slightly, fix more php6-only compile warnings in php_stream_copy_to_mem 2009-07-26 01:03:47 +00:00
Greg Beaver cd23986a7a fix --CLEAN-- of all.phpt, remove unnecessary check in phar_convert_again.phpt, and fix signature generation and checking for zip to also include central directory up to the signature, implement better check for end-of-zip at signature verification 2009-07-24 19:40:41 +00:00
Greg Beaver e1962da708 fix minor memory leak 2009-07-24 16:21:40 +00:00
Greg Beaver 42e0e5dfb7 fix signature generation/validation for zip archives by phar extension, fix a few edge cases where memory was leaked on error conditions by missing efree() 2009-07-24 15:42:17 +00:00
Greg Beaver f21744809e MFPECL: fix PECL bug #16338, php_stream_copy_to_stream{,_ex}() 2009-04-29 03:24:27 +00:00
Greg Beaver a6298331b5 update NEWS with phar enabling, fix swapping of time/date in timestamp saving for zip, which can cause crash on windows 2009-03-01 06:58:01 +00:00
Greg Beaver 7707318d61 cosmetics: fix warning (only affects suncc) 2009-02-21 02:32:16 +00:00
Greg Beaver 2344d80015 fix zip access to work in all compilers, present and future, and on all arches without potential for bus errors. This removes PHAR_ZIP_PACK in favor of a safer approach 2009-02-20 05:06:37 +00:00
Greg Beaver c351b71f2b fix memleaks on zip corruption 2009-02-16 18:55:06 +00:00
Greg Beaver 625eb9e0ec fix remaining big-endian issues with phar 2009-02-15 20:29:13 +00:00
Greg Beaver 9221abd00e fix getting/setting of all 16/32 values in zip 2009-02-15 19:22:42 +00:00
Sebastian Bergmann 08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Antony Dovgal 8b793f4274 MFH: fix ZTS build 2008-10-12 21:09:22 +00:00
Greg Beaver e16636f069 add tests for copy-on-write support
- fix metadata handling with cached phars
 - fix virtual_dirs with rmdir
 - ensure that after copy-on-write, all existing Phar objects link to the newly copied phar data
2008-10-12 19:40:11 +00:00
Greg Beaver bf268a68f9 cosmetics/maintainability: reduce code redundancy on error conditions 2008-10-11 21:22:58 +00:00
Greg Beaver eb41e0d64f work around crap stream filter implementation, update tests for compressed aliases in zip-based phar so they actually test the compression 2008-10-11 20:57:08 +00:00
Greg Beaver 498ffbc84f workaround for Bug #46147 for PHP < 5.2.7 2008-09-22 01:39:11 +00:00
Greg Beaver dd51a607e2 increase code coverage, fix bzip2-compressed alias in zip 2008-09-14 06:31:20 +00:00
Greg Beaver 6ac2c92ede 2 fixes, merge minor fixes from pecl/phar. Merge in corrected fix from pecl/phar for is_tar setting of tar_type 2008-08-31 02:14:03 +00:00
Greg Beaver c3e8485971 fix bug #45792: bz2 compressed files in zip failure 2008-08-21 05:17:28 +00:00
Steph Fox 4e5280a7a2 - ws/cs, macros, code that only affects other branches
- some unsynced changes need valgrind testing before they can go into this branch, see PECL/HEAD
2008-08-01 13:48:45 +00:00
Antony Dovgal b53da9cd80 fix folding 2008-07-29 10:52:08 +00:00
Dmitry Stogov 5c631e8765 Fixed wrong arguments order 2008-07-17 13:22:32 +00:00
Steph Fox ad20b9e6bb - pefree pemalloc'd filename 2008-06-21 20:14:43 +00:00
Steph Fox 22fb73c71e - Fix macro definition syntax
- Remove pre-existing workaround
2008-06-21 19:40:41 +00:00
Steph Fox 97cf2a15da - 5_2 compatibility stuff (so we can stay in sync with PECL) 2008-06-20 16:29:36 +00:00
Steph Fox aa694b8b51 - Kill 10 MSVC compiler warnings due to type conflict
- Make cached manifest test platform agnostic
- Comment out zend_(init|destroy)_rsrc_list() and associated references

@Greg: cached manifest test (now) passes here regardless, make of that what you will
2008-06-18 15:06:50 +00:00
Greg Beaver cbe23b9f20 fix windows build and more performance jumps (these are minor)
implement real copy-on-write
use virtual_dirs for wrapper stat
2008-06-18 06:38:47 +00:00