[pull] master from php:master #455
Merged
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
There are edge cases where computations can cause an integer overflow, which is undefined behaviour. Lately, some fuzzers seem to be hitting these quite frequently. While this behaviour is undefined, it doesn't actually matter in practice, the worst effect is having a wrong computation result, but no sane person would do computations on e.g. the year pow(2,63). Still, undefined behaviour is bad. Make the wrapping behaviour defined by using -fwrapv when possible. The scope of this is limited to timelib and doesn't affect php_date.c. The reason for this is that this may in theory prevent some optimizations and it also seems bad to affect code that lives so close to the PHP-native edge. I tested all issues. This fixes all but one issues, the remaining issue is in php_date.c. Fixes GH-13881. Fixes GH-14075. Fixes GH-15150. Fixes GH-16034. Fixes GH-16035. Fixes GH-16048. Fixes GH-16050. Fixes GH-16051. Fixes GH-16052. Fixes GH-16775. Fixes GH-16864. Fixes GH-16865. Fixes GH-16975. Fixes GH-17025. Fixes GH-17059. Closes GH-17060.
This test reads an ini "file" from a string, and expects a warning about locking. But if inifile support is disabled, then you'll get Warning: dba_open(): Handler "inifile" is not available in /path/to/ext/dba/tests/gh16390.php on line 3 instead. We skip the test if inifile support is disabled. Closes GH-17011.
* PHP-8.3: ext/dba/tests/gh16390.phpt: skip if inifile is disabled
* PHP-8.4: ext/dba/tests/gh16390.phpt: skip if inifile is disabled
The only difference between `DateTime::__wakeup()` and `DateTimeImmutable::__wakeup()` is which class name is included in the error message if the initialization from the data fails. Factor out a helper method that is given the class name, and use it for both methods.
Don't free the underlying nodes if we still have objects pointing to them, otherwise the objects are left with a NULL node pointer. Closes GH-17046.
* PHP-8.3: Fix GH-17040: SimpleXML's unset can break DOM objects
* PHP-8.4: Fix GH-17040: SimpleXML's unset can break DOM objects
This typo is particularly annoying if you search for "ldflags", because you won't find this function.
While the test obviously succeeds on Windows, it may occasionally conflict with parse_ini_file_variation6-win32.phpt[1], so we skip it like we do for many other of these tests which have win32 pendants. [1] <https://github.com/php/php-src/actions/runs/12077554275/job/33680647284#step:6:119> Closes GH-16989.
* PHP-8.2: Skip parse_ini_file_variation6.phpt on Windows
* PHP-8.3: Skip parse_ini_file_variation6.phpt on Windows
* PHP-8.4: Skip parse_ini_file_variation6.phpt on Windows
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )