cdb7aafc23
Fix memory leak(null coalescing operator with Spl hash)
...
The SEPARATE_ARG_IF_REF macro increased the refcount of the object passed as a
key.
However, when the key did not exist in the ArrayAccess implementation,
the code returned early without trying to decrement the refcount.
Add a test of `??` succeeding+failing on a SplObjectStorage instance.
2016-11-20 15:46:13 -08:00
1efb9fd32d
Fixed bug #73423 (Reproducible crash with GDB backtrace)
2016-11-02 12:11:30 +08:00
2301608736
Syncronize with 5.6 - __toString should return ""
2016-10-12 23:09:49 -07:00
c38f88ddb0
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-22 12:48:38 +02:00
4397306b32
fix bug related to #865
...
In case USE_KEY flag is active, RegexIterator->accept() should keep it's
old behavior which is to accept keys mapping arrays.
This broke after PHP 5.5 but was not noticed due to lack of tests for USE_KEY.
2016-09-22 12:46:19 +02:00
33d0ef0fef
Fix test
2016-09-12 21:04:23 -07:00
ecb7f58a06
Fix bug #73029 - Missing type check when unserializing SplArray
2016-09-12 21:04:23 -07:00
fab33740c5
Fix test
2016-09-12 20:15:18 -07:00
022e75cba1
Fix bug #73029 - Missing type check when unserializing SplArray
...
(cherry picked from commit 6d16288150be33392a3249e417a0929881feb9a2)
Conflicts:
ext/spl/spl_array.c
2016-09-12 17:42:23 +02:00
2597f5d665
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/spl/spl_iterators.c
2016-07-26 20:36:34 -04:00
4c2e1a13be
Fixed bug #72684 (AppendIterator segfault with closed generator)
2016-07-26 20:34:16 -04:00
9a2207c90a
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/spl/spl_directory.c
2016-07-22 15:27:55 +02:00
6b116932b2
Fix #72646 : SplFileObject::getCsvControl does not return the escape character
...
This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
2016-07-22 15:24:50 +02:00
f5ccd71d0c
Fix 72122 - don't use EH_THROW for calls to getIterator
2016-07-12 10:10:35 +02:00
c015095042
Merge branch 'PHP-5.6' into PHP-7.0
...
# Resolved conflicts:
# ext/spl/spl_directory.c
2016-07-05 16:43:39 +02:00
4c24f170ea
Fix bug #55701 : GlobIterator throws LogicException
...
GlobIterator throws LogicException with message 'The parent constructor was
not called' on its first operation when the glob expression doesn't match
any file. It also throws on the first operation after the iteration
completes, when the glob expression matches some files.
# Resolved conflicts:
# ext/spl/spl_directory.c
2016-07-05 16:39:25 +02:00
7648f20de3
Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
2016-04-19 10:59:10 +08:00
28a6ed9f9a
Fix bug #71735 : Double-free in SplDoublyLinkedList::offsetSet
2016-03-20 22:29:08 -07:00
f3309173f9
Fixed bug #62059
2016-03-20 18:17:44 +01:00
12f2665df8
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/spl/spl_observer.c
2016-03-20 17:48:06 +01:00
cc3cdd0057
Fixed bug #67582
2016-03-20 17:46:12 +01:00
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
a2522efa9f
Add extra ArrayObject::sort() test
2016-03-18 19:59:08 +01:00
094c808374
Fix bug #71838
2016-03-18 19:58:52 +01:00
b8f0cb063f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed test script
2016-03-17 15:23:53 +08:00
ead7632cf9
Fixed test script
2016-03-17 15:23:44 +08:00
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
0aa7163816
Fix AO object properties separation
2016-02-24 22:34:50 +01:00
079f2f7eb3
Forbid exchangeArray() during sorting
...
Previously this would leak.
2016-02-24 22:34:50 +01:00
eb885e9d6e
Fix leak on assignment to illegal AO offset
2016-02-24 17:39:16 +01:00
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
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
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
0bd64b50b8
Fixed bug #71617
2016-02-21 13:00:37 +01:00
825b7f895a
Update NEWS & Fixed test
2015-12-23 08:13:13 -08:00
8692a99551
Merge branch 'PHP-5.6' into PHP-7.0
2015-12-23 08:11:09 -08:00
620ccc9b1a
Fixed bug #71204 (segfault if clean spl_autoload_funcs while autoloading)
2015-12-23 08:10:59 -08:00
e21cb2daea
Fixed bug #71202 (Autoload function registered by another not activated immediately)
2015-12-23 07:48:00 -08:00
a3e1952700
Fixed bug #71153
2015-12-17 20:59:57 +01:00
311eb2b11e
Missed one place
2015-12-04 06:51:16 -08:00
7ac24aa661
Fixed bug #71028 (Undefined index with ArrayIterator)
2015-12-04 06:45:26 -08:00
9397f52724
Fixed Bug #70967 (Weird error handling for __toString when Error is thrown)
2015-11-28 23:38:19 -08:00
f8bf1f33a5
Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)
2015-11-23 07:08:47 -08:00
27aef97f65
Fixed bug #70868 (PCRE JIT and pattern reuse segfault)
2015-11-06 11:37:17 +08:00
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
1c0622a472
Make test for bug #70852 to cover all cases
2015-11-05 14:09:24 +08:00
51218b3b9d
Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.
2015-11-05 13:46:03 +08:00
e4ac4e75b5
Fixed bug #70853 (SplFixedArray throws exception when using ref variable as index)
2015-11-04 06:44:29 -08:00
26e5429f72
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #64172
Bug #70561 : Fix DirectoryIterator to throw OutOfBoundsException
Conflicts:
ext/pdo/pdo_dbh.c
2015-10-18 17:20:00 -07:00
0b35e0c5a1
Merge branch 'pull-request/1535' into PHP-5.6
...
* pull-request/1535:
Bug #70561 : Fix DirectoryIterator to throw OutOfBoundsException
2015-10-18 17:17:55 -07:00
Tyson Andre