Skip to content

Commit 72f80b2

Browse files
committed
Merge branch 'PHP-5.5'
2 parents 4b67c78 + 0119bbb commit 72f80b2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Zend/zend_operators.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2235,8 +2235,8 @@ ZEND_API void zendi_smart_strcmp(zval *result, zval *s1, zval *s2) /* {{{ */
22352235
{
22362236
int ret1, ret2;
22372237
int oflow1, oflow2;
2238-
long lval1, lval2;
2239-
double dval1, dval2;
2238+
long lval1 = 0, lval2 = 0;
2239+
double dval1 = 0.0, dval2 = 0.0;
22402240

22412241
if ((ret1=is_numeric_string_ex(Z_STRVAL_P(s1), Z_STRLEN_P(s1), &lval1, &dval1, 0, &oflow1)) &&
22422242
(ret2=is_numeric_string_ex(Z_STRVAL_P(s2), Z_STRLEN_P(s2), &lval2, &dval2, 0, &oflow2))) {

Zend/zend_operators.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static inline zend_uchar is_numeric_string_ex(const char *str, int length, long
132132
{
133133
const char *ptr;
134134
int base = 10, digits = 0, dp_or_e = 0;
135-
double local_dval;
135+
double local_dval = 0.0;
136136
zend_uchar type;
137137

138138
if (!length) {

0 commit comments

Comments
 (0)