forked from php/php-src
-
Notifications
You must be signed in to change notification settings - Fork 0
[pull] master from php:master #17
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
Open
pull
wants to merge
6,723
commits into
ConnectionMaster:master
Choose a base branch
from
php:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* PHP-8.3: Fix stream double free in phar
* PHP-8.4: Fix stream double free in phar
There are two bugfixes here. The first was a crash that I discovered while working on GH-19035. The check for when a file pointer was still occupied was wrong, leading to a UAF. Strangely, zip got this right. The second issue was that even after fixing the first one, the file contents were garbage. This is because the file write offset for the phar stream was wrong. Closes GH-19038.
* PHP-8.3: Fix phar crash and file corruption with SplFileObject
* PHP-8.4: Fix phar crash and file corruption with SplFileObject
…val to hold the name (#19030)
#19024) Also check that the callable exists while setting the option
This prevents some strlen computations
To make it easier for IDEs to understand what is going on
This is unnecessary now that the session name is a zend_string
This clarifies intention and uses less bytes in the struct
This saves 8 bytes
The `defaultMemoryManager` is only available via a non-public header and is not supposed to be used by users of the library [1]. It also has a very generic name, further indicating that it is not supposed to be used. Instead pass the memory manager explicitly, which is how the library is supposed to be used. [1] uriparser/uriparser#52 (comment)
This also omits defining unused HAVE_WINSOCK_H macro when building ext/sockets.
* PHP-8.3: Fix -Wuseless-escape warnings emitted by re2c (#19050)
* PHP-8.4: Fix -Wuseless-escape warnings emitted by re2c (#19050)
Since `ZSTR_LEN()` returns a `size_t` (unsigned integer), the value can only be either "not equal to 0" or "equal to 0". The third `else` branch was unreachable, making the `*handled_output = NULL;` assignment dead code.
* PHP-8.4: Update IR
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
⤵️ pull
Category: Build System
Category: Engine
Category: Optimizer
Extension: bcmath
Extension: bz2
Extension: calendar
Extension: com_dotnet
Extension: ctype
Extension: curl
Extension: date
Extension: dba
Extension: dom
Extension: enchant
Extension: exif
Extension: ffi
Extension: fileinfo
Extension: filter
Extension: ftp
Extension: gd
Extension: gettext
Extension: gmp
Extension: hash
Extension: iconv
Extension: intl
Extension: json
Extension: ldap
Extension: libxml
Extension: mbstring
Extension: mysqli
Extension: mysqlnd
Extension: odbc
Extension: opcache
Extension: openssl
Extension: pcntl
Extension: pcre
Extension: pdo (core)
Extension: pdo_dblib
Extension: pdo_firebird
Extension: pdo_mysql
Extension: pdo_odbc
Extension: pdo_pgsql
Extension: pdo_sqlite
Extension: pgsql
Extension: phar
Extension: posix
Extension: random
Extension: readline
Extension: reflection
Extension: session
Extension: shmop
Extension: simplexml
Extension: snmp
Extension: soap
Extension: sockets
Extension: sodium
Extension: spl
Extension: sqlite3
Extension: standard
Extension: sysvmsg
Extension: sysvsem
Extension: sysvshm
Extension: tidy
Extension: tokenizer
Extension: xml
Extension: xmlreader
Extension: xmlwriter
Extension: xsl
Extension: zend_test
Extension: zip
Extension: zlib
🔍 Ready for Review
Pull Request is not reviewed yet
SAPI: apache2handler
SAPI: cgi
SAPI: cli
SAPI: fpm
SAPI: fuzzer
SAPI: litespeed
SAPI: phpdbg
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )