com php-src: Fixed inproper IS_REF handling in ext/stan dard/tests/strings/bug27295.phpt: ext/standard/ scanf.c
| From: | Dmitry Stogov | Date: | Sun, 23 Feb 2014 10:48:15 +0000 |
| Subject: | com php-src: Fixed inproper IS_REF handling in ext/stan dard/tests/strings/bug27295.phpt: ext/standard/ scanf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77987@lists.php.net to get a copy of this message | ||
Commit: 6a856d4aa94db68942ac489abaf621dd387d9753
Author: Xinchen Hui <laruence@gmail.com> Sun, 23 Feb 2014 18:48:15 +0800
Parents: f21eb59cda8e0310b41a631bbe31595a1c0ea87e
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a856d4aa94db68942ac489abaf621dd387d9753
Log:
Fixed inproper IS_REF handling in ext/standard/tests/strings/bug27295.phpt
Bugs:
https://bugs.php.net/27295
Changed paths:
M ext/standard/scanf.c
Diff:
diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c
index 2e41a4f..4fd1498 100644
--- a/ext/standard/scanf.c
+++ b/ext/standard/scanf.c
@@ -742,15 +742,11 @@ literal:
if (numVars && objIndex >= argCount) {
break;
} else if (numVars) {
- zend_uint refcount;
-
current = &args[objIndex++];
- refcount = Z_REFCOUNT_P(current);
- zval_dtor(current);
- ZVAL_LONG(current, (long)(string - baseString) );
+ zval_dtor(Z_REFVAL_P(current));
+ ZVAL_LONG(Z_REFVAL_P(current), (long)(string - baseString) );
// Z_SET_REFCOUNT_P(current, refcount);
//??? Z_SET_ISREF_P(current);
- ZVAL_NEW_REF(current, current);
} else {
add_index_long(return_value, objIndex++, string - baseString);
}
@@ -867,15 +863,11 @@ literal:
if (numVars && objIndex >= argCount) {
break;
} else if (numVars) {
- zend_uint refcount;
-
current = &args[objIndex++];
- refcount = Z_REFCOUNT_P(current);
- zval_dtor( current );
- ZVAL_STRINGL( current, string, end-string);
- Z_SET_REFCOUNT_P(current, refcount);
+ zval_dtor(Z_REFVAL_P(current));
+ ZVAL_STRINGL(Z_REFVAL_P(current), string, end-string);
+// Z_SET_REFCOUNT_P(current, refcount);
//??? Z_SET_ISREF_PP(current);
- ZVAL_NEW_REF(current, current);
} else {
add_index_stringl(return_value, objIndex++, string, end-string, 1);
}
@@ -915,8 +907,8 @@ literal:
break;
} else if (numVars) {
current = &args[objIndex++];
- zval_dtor( current );
- ZVAL_STRINGL( current, string, end-string);
+ zval_dtor(Z_REFVAL_P(current));
+ ZVAL_STRINGL(Z_REFVAL_P(current), string, end-string);
} else {
add_index_stringl(return_value, objIndex++, string, end-string, 1);
}
@@ -1069,8 +1061,8 @@ addToInt:
} else if (numVars) {
/* change passed value type to string */
current = &args[objIndex++];
- zval_dtor(current);
- ZVAL_STRING(current, buf);
+ zval_dtor(Z_REFVAL_P(current));
+ ZVAL_STRING(Z_REFVAL_P(current), buf);
} else {
add_index_string(return_value, objIndex++, buf, 1);
}
@@ -1079,8 +1071,8 @@ addToInt:
break;
} else if (numVars) {
current = &args[objIndex++];
- zval_dtor(current);
- ZVAL_LONG(current, value);
+ zval_dtor(Z_REFVAL_P(current));
+ ZVAL_LONG(Z_REFVAL_P(current), value);
} else {
add_index_long(return_value, objIndex++, value);
}
@@ -1184,8 +1176,8 @@ addToFloat:
break;
} else if (numVars) {
current = &args[objIndex++];
- zval_dtor(current);
- ZVAL_DOUBLE(current, dvalue);
+ zval_dtor(Z_REFVAL_P(current));
+ ZVAL_DOUBLE(Z_REFVAL_P(current), dvalue);
} else {
add_index_double(return_value, objIndex++, dvalue );
}