diff options
| author | Xinchen Hui <laruence@php.net> | 2013-08-27 15:45:27 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-08-27 15:45:27 +0800 |
| commit | 72f80b2997920bf6fadc83ddcb3908252a9064eb (patch) | |
| tree | 968e9825b645e643b8c14f39a09672b6865f9738 | |
| parent | 4b67c781f3fdd93e6a602ee980176720f1ace10e (diff) | |
| parent | 0119bbba6b97e8657a92b0dc6327b04aad9532e7 (diff) | |
| download | php-git-72f80b2997920bf6fadc83ddcb3908252a9064eb.tar.gz | |
Merge branch 'PHP-5.5'
| -rw-r--r-- | Zend/zend_operators.c | 4 | ||||
| -rw-r--r-- | Zend/zend_operators.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 6073012188..34237387b6 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -2235,8 +2235,8 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2) /* {{{ */ { int ret1, ret2; int oflow1, oflow2; - long lval1, lval2; - double dval1, dval2; + long lval1 = 0, lval2 = 0; + double dval1 = 0.0, dval2 = 0.0; if ((ret1=is_numeric_string_ex(Z_STRVAL_P(s1), Z_STRLEN_P(s1), &lval1, &dval1, 0, &oflow1)) && (ret2=is_numeric_string_ex(Z_STRVAL_P(s2), Z_STRLEN_P(s2), &lval2, &dval2, 0, &oflow2))) { diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h index 38d96f1e9b..15ad79e4db 100644 --- a/Zend/zend_operators.h +++ b/Zend/zend_operators.h @@ -132,7 +132,7 @@ static inline zend_uchar is_numeric_string_ex(const char *str, int length, long { const char *ptr; int base = 10, digits = 0, dp_or_e = 0; - double local_dval; + double local_dval = 0.0; zend_uchar type; if (!length) { |