Fix fatal error during sccp shift eval #19972
Closed
+19
−2
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
Avoid returning early in this function, as other checks might still be needed to verify whether the given function can procude an error. Fixes oss-fuzz #447521098
Girgias
reviewed
Sep 27, 2025
Comment on lines
9999
to
+10003
| if (opcode == ZEND_SL || opcode == ZEND_SR || opcode == ZEND_BW_OR | ||
| || opcode == ZEND_BW_AND || opcode == ZEND_BW_XOR) { | ||
| return !zend_is_op_long_compatible(op1) || !zend_is_op_long_compatible(op2); | ||
| if (!zend_is_op_long_compatible(op1) || !zend_is_op_long_compatible(op2)) { | ||
| return 1; | ||
| } |
There was a problem hiding this comment.
Other thing you could do, is move the:
if ((opcode == ZEND_SL || opcode == ZEND_SR) && zval_get_long(op2) < 0) {
/* Shift by negative number throws an error. */
return 1;
}code check above this one or move this back to be last check as it was previously. This shouldn't be a problem now that ZEND_MOD is dealt separately.
There was a problem hiding this comment.
I don't think it's great to mix early returns for positive and negative results (or conditional results), as checks become order-dependent. I'll keep this simple change for now, but if you feel strongly you can still adjust on master.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Avoid returning early in this function, as other checks might still be needed to verify whether the given function can procude an error.
Fixes oss-fuzz #447521098