diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-08-19 20:00:40 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-08-19 20:21:23 +0100 |
| commit | b3ba0f6ab018eece2cee391a4b64d9315e801840 (patch) | |
| tree | 6378b96f68f67e32e9f3062daeb72880e6629c54 | |
| parent | cb770cdc03cb414ffae34e40f43b8c109af5b0e8 (diff) | |
| download | php-git-b3ba0f6ab018eece2cee391a4b64d9315e801840.tar.gz | |
Prevent bit shift count wrapping quirkiness on some CPUs for left shift
| -rw-r--r-- | Zend/zend_operators.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 98210953a0..61bdbc806c 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1493,6 +1493,12 @@ ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) / op1_lval = Z_LVAL_P(op1); } + /* prevent wrapping quirkiness on some processors where << 64 + x == << x */ + if (Z_LVAL_P(op2) >= SIZEOF_LONG * 8) { + ZVAL_LONG(result, 0); + return SUCCESS; + } + if (Z_LVAL_P(op2) < 0) { zend_error(E_WARNING, "Bit shift by negative number"); ZVAL_FALSE(result); |