From 6a94568f8246f6df33ee259429875bd10ffdf0a8 Mon Sep 17 00:00:00 2001 From: Andrea Faulds Date: Fri, 15 Aug 2014 17:29:26 +0100 Subject: Return FALSE on bit shift by negative number --- Zend/zend_operators.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Zend/zend_operators.c') diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 921d71b685..7d591f52ef 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); } + if (Z_LVAL_P(op2) < 0) { + zend_error(E_WARNING, "Bit shift by negative number"); + ZVAL_FALSE(result); + return FAILURE; + } + ZVAL_LONG(result, op1_lval << Z_LVAL_P(op2)); return SUCCESS; } @@ -1513,6 +1519,12 @@ ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) op1_lval = Z_LVAL_P(op1); } + if (Z_LVAL_P(op2) < 0) { + zend_error(E_WARNING, "Bit shift by negative number"); + ZVAL_FALSE(result); + return FAILURE; + } + ZVAL_LONG(result, op1_lval >> Z_LVAL_P(op2)); return SUCCESS; } -- cgit v1.2.1 From 38bc0a05c0bcf6008347c2297ce1f0a5607409d5 Mon Sep 17 00:00:00 2001 From: Andrea Faulds Date: Sat, 16 Aug 2014 00:54:37 +0100 Subject: Prevent bit shift count wrapping quirkiness on some CPUs for right shift --- Zend/zend_operators.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Zend/zend_operators.c') diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 7d591f52ef..98210953a0 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1519,6 +1519,12 @@ ZEND_API int shift_right_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, (Z_LVAL_P(op1) < 0) ? -1 : 0); + return SUCCESS; + } + if (Z_LVAL_P(op2) < 0) { zend_error(E_WARNING, "Bit shift by negative number"); ZVAL_FALSE(result); -- cgit v1.2.1 From b3ba0f6ab018eece2cee391a4b64d9315e801840 Mon Sep 17 00:00:00 2001 From: Andrea Faulds Date: Tue, 19 Aug 2014 20:00:40 +0100 Subject: Prevent bit shift count wrapping quirkiness on some CPUs for left shift --- Zend/zend_operators.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Zend/zend_operators.c') 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); -- cgit v1.2.1 From be88d0e5d4ab5fdf775f3e38cf054aa0451f0d36 Mon Sep 17 00:00:00 2001 From: Andrea Faulds Date: Tue, 16 Sep 2014 10:24:33 +0100 Subject: Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG --- Zend/zend_operators.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zend/zend_operators.c') diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 61bdbc806c..ce47c26854 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1494,7 +1494,7 @@ ZEND_API int shift_left_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) / } /* prevent wrapping quirkiness on some processors where << 64 + x == << x */ - if (Z_LVAL_P(op2) >= SIZEOF_LONG * 8) { + if (Z_LVAL_P(op2) >= SIZEOF_ZEND_LONG * 8) { ZVAL_LONG(result, 0); return SUCCESS; } @@ -1526,7 +1526,7 @@ ZEND_API int shift_right_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) } /* prevent wrapping quirkiness on some processors where >> 64 + x == >> x */ - if (Z_LVAL_P(op2) >= SIZEOF_LONG * 8) { + if (Z_LVAL_P(op2) >= SIZEOF_ZEND_LONG * 8) { ZVAL_LONG(result, (Z_LVAL_P(op1) < 0) ? -1 : 0); return SUCCESS; } -- cgit v1.2.1