ext/date: null bytes in timezones can only happen via HT initialization #19357
+12
−15
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
nielsdos
reviewed
Aug 5, 2025
ext/date/php_date.c
Outdated
| if (warning_message) { | ||
| spprintf(warning_message, 0, "Timezone must not contain null bytes"); | ||
| } | ||
| if (UNEXPECTED(zend_str_has_nul_byte(tz_zstr))) { |
There was a problem hiding this comment.
The cleaner, and faster, approach is to move this check simply to php_date_timezone_initialize_from_hash IMO.
There was a problem hiding this comment.
Makes sense, wasn't sure if I should move it up or not.
In which case we don't use the warning_message anyway
Girgias
force-pushed
the
date-drop-check
branch
from
9fffa9b to
d8a3de1
Compare
nielsdos
approved these changes
Aug 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In which case we don't use the warning_message anyway