fix(frenchtojd): range-check zend_long args before narrowing to int - #23555
Open
lacatoire wants to merge 1 commit into
Open
fix(frenchtojd): range-check zend_long args before narrowing to int#23555lacatoire wants to merge 1 commit into
lacatoire wants to merge 1 commit into
Conversation
FrenchToSdn() takes C int parameters, so values like month=1+2**32 were silently truncated to their low 32 bits, aliasing into the valid range and bypassing the guard in french.c. Add an explicit range check against the zend_long variables in the PHP_FUNCTION wrapper, mirroring the guard that already exists inside FrenchToSdn(). This ensures out-of-range values always return 0, matching the documented contract. Fixes: #663
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
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.
Summary
FrenchToSdn()inext/calendar/french.ctakes Cintparameters.PHP_FUNCTION(frenchtojd)parses intozend_longbut passes them directly toFrenchToSdn(), causing implicit narrowing. Values whose low 32 bits alias into the valid range (e.g.month = 1 + 2**32) bypass the guard infrench.cand return a valid-looking Julian Day instead of0.Fix
Add an explicit range check against the
zend_longvariables inPHP_FUNCTION(frenchtojd), before the call toFrenchToSdn(), mirroring the guard that already exists inside the helper:Valid inputs and already-out-of-range values (no aliasing) are unaffected.
Test added
ext/calendar/tests/frenchtojd_overflow.phptcovers the three aliased-overflow cases (month, day, year each + 2**32) and confirms a valid call still returns the correct Julian Day.