Skip to content
forked from php/php-src

sync master #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 37 commits into from
Oct 3, 2020
Merged

sync master #7

merged 37 commits into from
Oct 3, 2020

Conversation

chopins
Copy link
Owner

@chopins chopins commented Oct 3, 2020

No description provided.

dstogov and others added 30 commits October 1, 2020 13:18
* PHP-7.3:
  Backport of a partial fix for bug Bug #76982 (memory leak declaring closure in included file).
* PHP-7.4:
  Backport of a partial fix for bug Bug #76982 (memory leak declaring closure in included file).
Add GC support to dual_it. This is still missing AppendIterator
support.
This also requires adding GC support for ArrayIterator internal
iterators.
For consistency with str* and mb_str* functions.

Closes GH-6245.
Closes php/php-tasks#20.
For strrpos with positive out of bounds offsets was not detected.
The issue affected both CurlHandle and CurlMultiHandle. I'll have
to double check this for other resource->object conversions as well.
Intended to find issues in opaque object destructors.

Closes GH-6251.
When committing I didn't notice that version had been just bumped
* PHP-7.3:
  [ci skip] moved soap fix to 7.3.23
When committing I didn't notice that version had been just bumped
* PHP-7.4:
  [ci skip] moved soap fix to 7.4.11
  [ci skip] moved soap fix to 7.3.23
Turns out we do need to return FAILURE here on div by zero
exception. Use a three-way return value from div_function_base.

Fixes oss-fuzz #25975.
* PHP-7.3:
  Fix out-of-bounds write
* PHP-7.4:
  Fix out-of-bounds write
nikic and others added 7 commits October 2, 2020 15:14
This flag generates an arginfo file that discards all type and
default value information. As such, it is compatible with old
(and very old) PHP versions.

Intended for use by extensions to generate one arginfo file for
PHP 8 and one for older versions.
The linkage can be specified as the argument to the
@generate-function-entries tag. Test this on zend_test.
Now that it is supported, declare that CType is part of the FFI
namespace, not a freestanding class.
@chopins chopins merged commit 86e41ca into chopins:master Oct 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants