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

75 Commits

Author SHA1 Message Date
Stanislav Malyshev b03993dde9 Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion 2014-06-24 10:29:26 -07:00
Remi Collet ea466a316f Fix Request #67453 Allow to unserialize empty data.
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.

This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
2014-06-17 09:38:54 +02:00
Bob Weinand a93e734f81 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-14 00:08:36 +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
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 1f516510b7 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 10:44:56 +08:00
Xinchen Hui 39a3007ab2 MFH 2012-12-13 10:44:14 +08:00
Dmitry Stogov df97c3aa0d Use get_gc instead of hacks of get_properties 2012-12-05 17:58:36 +04:00
Xinchen Hui 6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Johannes Schlüter b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
2012-06-27 23:26:33 +02:00
Gustavo André dos Santos Lopes 0f001703a8 Fixed bug #61453.
The "hash" function used strncpy on data that would have NUL bytes, ending the
copy prematurely and causing collisions between objects.
2012-03-21 12:42:09 +00:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Michael Wallner d8ca919da1 Fixed bug #60240 (invalid read/writes when unserializing specially crafted strings) 2011-12-02 11:50:22 +00:00
Xinchen Hui a8a0a6c3f1 Sizeof mismatch 2011-08-08 08:49:55 +00:00
Xinchen Hui dbd405a001 Wrong sizeof 2011-08-08 02:33:03 +00:00
Felipe Pena 191df85605 - Drop C++ style comments 2011-06-10 23:14:15 +00:00
Felipe Pena 53b1c76efe - Fixed SplObjectStorage::offsetSet arginfo, reported in bug #54118 2011-03-01 00:13:23 +00:00
Felipe Pena 18097605b7 - Fixed SplObjectStorage::offsetSet arginfo, reported in bug #54118 2011-03-01 00:13:23 +00:00
Etienne Kneuss 47fc5e06f0 Implement SplObjectStorage::removeAllExcept (Patch by Matthey Turland) 2011-01-05 15:01:18 +00:00
Etienne Kneuss 78728e33fa Implement SplObjectStorage::removeAllExcept (Patch by Matthey Turland) 2011-01-05 15:01:18 +00:00
Felipe Pena 927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena 0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Felipe Pena 6958cb4a14 - Added missing void arg checks 2010-11-14 18:40:08 +00:00
Felipe Pena 8192f0f771 - Added missing void arg checks 2010-11-14 18:40:08 +00:00
Gustavo André dos Santos Lopes 384cd8cda5 - Small optimization of the fix of bug #53071. It's not necessary to destroy
the debug info as it's not holding references anymore (the fix removed
  the refcount increments).
2010-10-25 02:03:20 +00:00
Gustavo André dos Santos Lopes 21d704063d - Small optimization of the fix of bug #53071. It's not necessary to destroy
the debug info as it's not holding references anymore (the fix removed
  the refcount increments).
2010-10-25 02:03:20 +00:00
Gustavo André dos Santos Lopes 5721132c29 - Fixed bug #53071 (SPLObjectStorage defeats gc_collect_cycles). 2010-10-25 01:41:54 +00:00
Gustavo André dos Santos Lopes 7fcce35f9b - Fixed bug #53071 (SPLObjectStorage defeats gc_collect_cycles). 2010-10-25 01:41:54 +00:00
Felipe Pena f0d2559d26 - Fixed bug #53144 (SplObjectStorage::removeAll()) 2010-10-24 14:03:07 +00:00
Felipe Pena 6887b97a8d - Fixed bug #53144 (SplObjectStorage::removeAll()) 2010-10-24 14:03:07 +00:00
Stanislav Malyshev 865f85718f fix SplObjectStorage unserialization (CVE-2010-2225) 2010-06-29 00:58:31 +00:00
Stanislav Malyshev de8022e905 fix SplObjectStorage unserialization (CVE-2010-2225) 2010-06-29 00:58:31 +00:00
Michael Wallner 89e93723fb Added support for object references in recursive serialize() calls. FR #36424 2010-05-26 07:24:37 +00:00
Dmitry Stogov c5237d82bf Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties 2010-05-24 14:11:39 +00:00
Etienne Kneuss 74396cf3d2 fix the fix for the fix 2010-05-10 13:03:33 +00:00
Etienne Kneuss 815db040a9 Fix crash 2010-05-10 12:38:13 +00:00
Felipe Pena 8d46707889 - Fix crash when instantiating MultipleIterator 2010-05-10 01:39:58 +00:00
Kalle Sommer Nielsen 5c628d550b Fix build, declarings first 2010-05-03 09:21:21 +00:00
Etienne Kneuss f9532adcc6 Fix misplaced code 2010-04-29 17:14:37 +00:00
Etienne Kneuss e6ee260b25 Implement SplObjectStorage::getHash() 2010-04-29 15:47:41 +00:00
Sebastian Bergmann 9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Etienne Kneuss ef2b799a28 Fix bug #49263 (Offset error when unserializing self-references in SplObjectStorage) 2009-10-06 13:34:56 +00:00
Etienne Kneuss 6e164aa35a Fix several recursion problems when var_dump'ing self-referencing objects 2009-08-13 22:07:05 +00:00
Felipe Pena fc4e43ec3c MFH:
- Added missing methods' arginfo (for void params)
- Fixed arginfos:
  - MultipleIterator::__construct
  - MultipleIterator::setFlags      (Thanks Philip!)
  - SplFixedArray::__construct
2009-07-04 20:31:27 +00:00
Etienne Kneuss 225d86dcfa MFH: Fix #47671 (cloning SplObjectStorage instances) 2009-03-19 02:45:17 +00:00
Etienne Kneuss 5755d152ca MFH: Implement SplObjectStorage::addAll/removeAll 2009-01-16 22:20:53 +00:00
Etienne Kneuss cd63e52c0b MFH: Fix #47045 (Correctly compare splobjectstorages with ==) 2009-01-14 15:53:03 +00:00