com php-src: Fixed parameter parsing: Zend/zend_API.h
| From: | Dmitry Stogov | Date: | Mon, 18 Aug 2014 06:08:48 +0000 |
| Subject: | com php-src: Fixed parameter parsing: Zend/zend_API.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80575@lists.php.net to get a copy of this message | ||
Commit: f3dc4421ff6710eeafd02498410ad9a1683f1401
Author: Dmitry Stogov <dmitry@zend.com> Mon, 18 Aug 2014 10:08:48 +0400
Parents: 8b3c2cc47eb91c8c97fb0f511c735511be7b8bc5
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f3dc4421ff6710eeafd02498410ad9a1683f1401
Log:
Fixed parameter parsing
Changed paths:
M Zend/zend_API.h
Diff:
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index b40afc1..0268374 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1078,15 +1078,15 @@ static zend_always_inline int _z_param_long(zval *arg, long *dest, zend_bool
*is
*is_null = 0;
}
if (EXPECTED(Z_TYPE_P(arg) == IS_LONG)) {
+ *dest = Z_LVAL_P(arg);
+ } else if (EXPECTED(Z_TYPE_P(arg) == IS_DOUBLE)) {
if (strict && UNEXPECTED(Z_DVAL_P(arg) > LONG_MAX)) {
*dest = LONG_MAX;
} else if (strict && UNEXPECTED(Z_DVAL_P(arg) < LONG_MIN)) {
*dest = LONG_MIN;
} else {
- *dest = Z_LVAL_P(arg);
+ *dest = zend_dval_to_lval(Z_DVAL_P(arg));
}
- } else if (EXPECTED(Z_TYPE_P(arg) == IS_DOUBLE)) {
- *dest = zend_dval_to_lval(Z_DVAL_P(arg));
} else if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
double d;
int type;