Joe Watkins
e27a43b7be
variable used out of scope
2016-04-28 15:40:28 +01:00
Xinchen Hui
7648f20de3
Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
2016-04-19 10:59:10 +08:00
Nikita Popov
b1e854f776
Fix bug #71334
...
Always duplicate the array before doing a sort with user-defined
comparison function, to avoid access to the intermediate
inconsistent state.
I've also dropped the "array modification" warning, as protection
against modifications is no longer relevant if we're always working
on a copy anyway.
This also required some changes to how SplArray forwards calls to
sorting functions.
2016-03-30 22:49:27 +02:00
Stanislav Malyshev
28a6ed9f9a
Fix bug #71735 : Double-free in SplDoublyLinkedList::offsetSet
2016-03-20 22:29:08 -07:00
Nikita Popov
f3309173f9
Fixed bug #62059
2016-03-20 18:17:44 +01:00
Nikita Popov
12f2665df8
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/spl/spl_observer.c
2016-03-20 17:48:06 +01:00
Nikita Popov
cc3cdd0057
Fixed bug #67582
2016-03-20 17:46:12 +01:00
Nikita Popov
8023204d21
Fixed bug #52339
...
Autoloader 101: Don't throw if you fail. PHP will throw for you.
2016-03-18 20:28:58 +01:00
Nikita Popov
a2522efa9f
Add extra ArrayObject::sort() test
2016-03-18 19:59:08 +01:00
Nikita Popov
094c808374
Fix bug #71838
2016-03-18 19:58:52 +01:00
Xinchen Hui
b8f0cb063f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test script
2016-03-17 15:23:53 +08:00
Xinchen Hui
ead7632cf9
Fixed test script
2016-03-17 15:23:44 +08:00
Xinchen Hui
753bbad535
Useless check (part of #71753 )
2016-03-10 15:43:22 +08:00
James Titcumb
c4b188871e
Fix bug #71575 removing extra semicolons outside macros
2016-03-03 16:41:03 +01:00
Nikita Popov
fd561505f4
Fix construction of AO with overloaded object error
...
a) Fix uses of zend_string in error message
b) Don't assign the overloaded object as the backing storage, that
sort of defeats the point. Instead leave the previous value.
2016-02-24 22:34:50 +01:00
Nikita Popov
0aa7163816
Fix AO object properties separation
2016-02-24 22:34:50 +01:00
Nikita Popov
079f2f7eb3
Forbid exchangeArray() during sorting
...
Previously this would leak.
2016-02-24 22:34:50 +01:00
Nikita Popov
eb885e9d6e
Fix leak on assignment to illegal AO offset
2016-02-24 17:39:16 +01:00
Nikita Popov
ea02f57656
Don't use ht applyCount for AO sorting protection
...
Instead use the AOs own applyCount that just got freed up. Using the
apply count of the HashTable has various side effects, e.g. preventing
the ArrayObject from being dumped.
2016-02-24 17:18:07 +01:00
Nikita Popov
38db6ff306
Remove recursion checks from AO get_properties
...
These are pointless, there is no recursion (of that kind) happening
there.
2016-02-24 17:10:28 +01:00
Nikita Popov
78b29310bc
Remove check_std_props arg from get_hash_table
...
get_properties() is the only place using it, so handle it only
there.
2016-02-22 13:09:54 +01:00
Nikita Popov
3f5c80e8c2
Don't recurse into USE_OTHER checking STD_PROP_LIST
...
If STD_PROP_LIST is explicitly disabled in the constructor, it
should really be disabled.
2016-02-22 13:04:19 +01:00
Nikita Popov
6c2ca18fe0
Fix typo in previous commit
...
Happened to be correct because array is the first member, but
definitely not what I wanted...
2016-02-22 12:39:07 +01:00
Nikita Popov
fd6ac61064
Fix ArrayObject clone for certain USE_OTHER cases
...
We can't simply use HASH_OF, need to use the usual hash table
getter.
2016-02-22 12:35:00 +01:00
Nikita Popov
32e2801ff9
Use USE_OTHER for ArrayIterator cloning
...
intern->array should never be an array with refcount 2.
2016-02-22 12:35:00 +01:00
Nikita Popov
0bd64b50b8
Fixed bug #71617
2016-02-21 13:00:37 +01:00
Stanislav Malyshev
9afb29aa68
Remove TSRMLS_* from code, they are not used anymore
2016-02-17 22:44:05 -08:00
Stanislav Malyshev
52e0c4081f
Fix bug #71313 - Use-after-free vulnerability in SPL(SplObjectStorage, unserialize)
2016-01-17 23:23:42 -08:00
Stanislav Malyshev
bcd64a9bdd
Fixed bug #71311 : Use-after-free vulnerability in SPL(ArrayObject, unserialize)
2016-01-17 17:53:03 -08:00
Bogdan Padalko
2b4625d687
Remove obj handlers ptr value from spl_object_hash()
...
We still keep the same output length, for people who rely on the
return value having a specific format. The handler part will now
simply be always the same (it was the same nearly always anyway).
The motivation behind this change is to avoid breaking
spl_object_hash() and SplObjectStorage if an extension changes the
handlers table of an object. This has come up, for example, in
weakref implementations.
2016-01-12 16:47:21 +01:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Tom Van Looy
aadb3dd503
These function docs are referencing zend_object_value but this should be zend_object
2015-12-24 10:24:53 +01:00
Xinchen Hui
c2fa01b939
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:/php-src:
update NEWS
update NEWS
fix merge mistake
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Sort 7.0.1 extensions' entries
Added test for bug #71201
Bug #71201 round() segfault on 64-bit builds
Add CVE for #71020 (PHP 7.0.1)
Update NEWS & Fixed test
Fixed bug #71204 (segfault if clean spl_autoload_funcs while autoloading)
This should never fail
Fixed bug #71202 (Autoload function registered by another not activated immediately)
Updated NEWS
Added support for HTTP 451
2015-12-24 10:42:42 +08:00
Xinchen Hui
64071fc531
Superfluous semicolon
2015-12-24 10:41:05 +08:00
Xinchen Hui
825b7f895a
Update NEWS & Fixed test
2015-12-23 08:13:13 -08:00
Xinchen Hui
8692a99551
Merge branch 'PHP-5.6' into PHP-7.0
2015-12-23 08:11:09 -08:00
Xinchen Hui
620ccc9b1a
Fixed bug #71204 (segfault if clean spl_autoload_funcs while autoloading)
2015-12-23 08:10:59 -08:00
Xinchen Hui
9cc4cdbe57
This should never fail
2015-12-23 07:52:24 -08:00
Xinchen Hui
e21cb2daea
Fixed bug #71202 (Autoload function registered by another not activated immediately)
2015-12-23 07:48:00 -08:00
Nikita Popov
a3e1952700
Fixed bug #71153
2015-12-17 20:59:57 +01:00
Xinchen Hui
c096a281be
The first arg is optional
2015-12-10 19:36:41 +08:00
Xinchen Hui
7c1ddcc67f
Fixed bug #71077 (ReflectionMethod for ArrayObject constructor returns wrong number of parameters)
2015-12-10 08:58:28 +08:00
Xinchen Hui
311eb2b11e
Missed one place
2015-12-04 06:51:16 -08:00
Xinchen Hui
7ac24aa661
Fixed bug #71028 (Undefined index with ArrayIterator)
2015-12-04 06:45:26 -08:00
Xinchen Hui
9397f52724
Fixed Bug #70967 (Weird error handling for __toString when Error is thrown)
2015-11-28 23:38:19 -08:00
Xinchen Hui
f8bf1f33a5
Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)
2015-11-23 07:08:47 -08:00
Xinchen Hui
27aef97f65
Fixed bug #70868 (PCRE JIT and pattern reuse segfault)
2015-11-06 11:37:17 +08:00
Reeze Xia
435565a54f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Make test for bug #70852 to cover all cases
Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.
2015-11-05 14:28:49 +08:00
Reeze Xia
1c0622a472
Make test for bug #70852 to cover all cases
2015-11-05 14:09:24 +08:00