php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 14:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
95,426 Commits 547 Branches 1,481 Tags
f63ba809a1961840407db08d0e5b59873b977366
Commit Graph

1842 Commits

Author SHA1 Message Date
Nikita Popov
bc1f884ef7 Merge branch 'PHP-7.0' 2016-03-30 22:49:36 +02: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
85ccebc1c2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix bug #71750: use zend_string_safe_alloc for calculated allocations
  Fix bug #71735: Double-free in SplDoublyLinkedList::offsetSet
 2016-03-20 22:51:12 -07:00
Stanislav Malyshev
28a6ed9f9a Fix bug #71735: Double-free in SplDoublyLinkedList::offsetSet 2016-03-20 22:29:08 -07:00
Nikita Popov
dab8e584da Merge branch 'PHP-7.0' 2016-03-20 18:18:14 +01:00
Nikita Popov
f3309173f9 Fixed bug #62059 2016-03-20 18:17:44 +01:00
Nikita Popov
c4ccb5d5fa Merge branch 'PHP-7.0' 2016-03-20 17:48:22 +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
e8f056e535 Merge branch 'PHP-7.0' 2016-03-18 20:29:09 +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
09da666cfa Merge branch 'PHP-7.0' 2016-03-18 20:00:19 +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
f3dd50d650 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test script
  Update NEWS
  Fixed bug #71841 (EG(error_zval) is not handled well)
  Fixed bug #71840 (Unserialize accepts wrongly data)

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2016-03-17 15:26:40 +08: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
50960d85cc Merge branch 'PHP-7.0' 
* PHP-7.0:
  Useless check (part of #71753)
  object->ce should not be NULL
  Fixed typo (partially fix for #71753)
  emalloc never returns NULL (partially fix for #71753)
 2016-03-10 15:43:53 +08:00
Xinchen Hui
753bbad535 Useless check (part of #71753) 2016-03-10 15:43:22 +08:00
Nikita Popov
f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
James Titcumb
c4b188871e Fix bug #71575 removing extra semicolons outside macros 2016-03-03 16:41:03 +01:00
Dmitry Stogov
c67c166f93 Removed zend_fcall_info.symbol_table 2016-03-02 17:50:55 +03:00
Nikita Popov
a1c9bd8803 Merge branch 'PHP-7.0' 2016-02-24 22:35:14 +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
55c0de8f95 Merge branch 'PHP-7.0' 2016-02-24 17:44:33 +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
d5769d4234 Merge branch 'PHP-7.0' 2016-02-22 13:11:24 +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
7e81b8adbb Merge branch 'PHP-7.0' 2016-02-22 12:40:30 +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
e24bf80352 Merge branch 'PHP-7.0' 2016-02-22 12:35:09 +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
37d1bbe456 Merge branch 'PHP-7.0' 2016-02-21 13:01:28 +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
ea35de6e31 Merge branch 'PHP-7.0' 
* PHP-7.0: (35 commits)
  fix tests
  update NEWS
  fix tests
  fix NEWS
  Update NEWS
  update NEWS
  Fixed bug #71475: openssl_seal() uninitialized memory usage
  Fixed bug #71488: Stack overflow when decompressing tar archives
  fix tests
  fix wrong gc sequence
  revert the API string as well
  update NEWS
  Revert "Fix #70720"
  sync NEWS
  reset ext/session to the state of 7.0.2
  update NEWS
  update NEWS
  add missing headers for SIZE_MAX
  backport the escapeshell* functions hardening branch
  add tests
  ...
 2016-02-01 20:46:06 -08:00
Nikita Popov
5c327d7f5c Use handle as hash in SplObjectStorage 
For the default implementation, use a more efficient integer-based
hash. The getHash() interface still requires a string.
 2016-01-30 14:19:11 +01: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
Nikita Popov
bef124513e Merge branch 'PHP-7.0' 2016-01-12 16:48:44 +01: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
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +02: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