com php-src: Fixed typo: ext/standard/var_unserializer.c ext/standard/var_unserializer.re
| From: | Anatol Belski | Date: | Mon, 10 Aug 2015 09:06:17 +0000 |
| Subject: | com php-src: Fixed typo: ext/standard/var_unserializer.c ext/standard/var_unserializer.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88619@lists.php.net to get a copy of this message | ||
Commit: 73a69c9c03587dfa1dcfb488e27f5bb42218ed4f
Author: Xinchen Hui <laruence@php.net> Mon, 10 Aug 2015 17:06:17 +0800
Parents: 1bf20a18cffed6845c77e4da4ebf114702f21954
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=73a69c9c03587dfa1dcfb488e27f5bb42218ed4f
Log:
Fixed typo
Changed paths:
M ext/standard/var_unserializer.c
M ext/standard/var_unserializer.re
Diff:
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 6bc37a8..3f7bf1c 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -470,12 +470,13 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements)
{
zval retval;
zval fname;
- HashTable *ht = Z_OBJPROP_P(rval);
+ HashTable *ht;
if (Z_TYPE_P(rval) != IS_OBJECT) {
return 0;
}
+ ht = Z_OBJPROP_P(rval);
zend_hash_resize(ht, zend_hash_num_elements(ht) + elements);
if (!process_nested_data(UNSERIALIZE_PASSTHRU, ht, elements, 1)) {
return 0;
@@ -529,7 +530,7 @@ PHPAPI int php_var_unserialize_ex(UNSERIALIZE_PARAMETER)
start = cursor;
-#line 533 "ext/standard/var_unserializer.c"
+#line 534 "ext/standard/var_unserializer.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@@ -589,9 +590,9 @@ yy2:
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ':') goto yy95;
yy3:
-#line 880 "ext/standard/var_unserializer.re"
+#line 881 "ext/standard/var_unserializer.re"
{ return 0; }
-#line 595 "ext/standard/var_unserializer.c"
+#line 596 "ext/standard/var_unserializer.c"
yy4:
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ':') goto yy89;
@@ -634,13 +635,13 @@ yy13:
goto yy3;
yy14:
++YYCURSOR;
-#line 874 "ext/standard/var_unserializer.re"
+#line 875 "ext/standard/var_unserializer.re"
{
/* this is the case where we have less data than planned */
php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
return 0; /* not sure if it should be 0 or 1 here? */
}
-#line 644 "ext/standard/var_unserializer.c"
+#line 645 "ext/standard/var_unserializer.c"
yy16:
yych = *++YYCURSOR;
goto yy3;
@@ -670,7 +671,7 @@ yy20:
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 729 "ext/standard/var_unserializer.re"
+#line 730 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
zend_long elements;
@@ -815,7 +816,7 @@ yy20:
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
-#line 819 "ext/standard/var_unserializer.c"
+#line 820 "ext/standard/var_unserializer.c"
yy25:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -840,7 +841,7 @@ yy27:
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 721 "ext/standard/var_unserializer.re"
+#line 722 "ext/standard/var_unserializer.re"
{
//??? INIT_PZVAL(rval);
@@ -848,7 +849,7 @@ yy27:
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
}
-#line 852 "ext/standard/var_unserializer.c"
+#line 853 "ext/standard/var_unserializer.c"
yy32:
yych = *++YYCURSOR;
if (yych == '+') goto yy33;
@@ -869,7 +870,7 @@ yy34:
yych = *++YYCURSOR;
if (yych != '{') goto yy18;
++YYCURSOR;
-#line 700 "ext/standard/var_unserializer.re"
+#line 701 "ext/standard/var_unserializer.re"
{
zend_long elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
@@ -890,7 +891,7 @@ yy34:
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 894 "ext/standard/var_unserializer.c"
+#line 895 "ext/standard/var_unserializer.c"
yy39:
yych = *++YYCURSOR;
if (yych == '+') goto yy40;
@@ -911,7 +912,7 @@ yy41:
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 672 "ext/standard/var_unserializer.re"
+#line 673 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
zend_string *str;
@@ -939,7 +940,7 @@ yy41:
ZVAL_STR(rval, str);
return 1;
}
-#line 943 "ext/standard/var_unserializer.c"
+#line 944 "ext/standard/var_unserializer.c"
yy46:
yych = *++YYCURSOR;
if (yych == '+') goto yy47;
@@ -960,7 +961,7 @@ yy48:
yych = *++YYCURSOR;
if (yych != '"') goto yy18;
++YYCURSOR;
-#line 645 "ext/standard/var_unserializer.re"
+#line 646 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -987,7 +988,7 @@ yy48:
ZVAL_STRINGL(rval, str, len);
return 1;
}
-#line 991 "ext/standard/var_unserializer.c"
+#line 992 "ext/standard/var_unserializer.c"
yy53:
yych = *++YYCURSOR;
if (yych <= '/') {
@@ -1075,7 +1076,7 @@ yy61:
}
yy63:
++YYCURSOR;
-#line 636 "ext/standard/var_unserializer.re"
+#line 637 "ext/standard/var_unserializer.re"
{
#if SIZEOF_ZEND_LONG == 4
use_double:
@@ -1084,7 +1085,7 @@ use_double:
ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
-#line 1088 "ext/standard/var_unserializer.c"
+#line 1089 "ext/standard/var_unserializer.c"
yy65:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -1143,7 +1144,7 @@ yy73:
yych = *++YYCURSOR;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 620 "ext/standard/var_unserializer.re"
+#line 621 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
@@ -1159,7 +1160,7 @@ yy73:
return 1;
}
-#line 1163 "ext/standard/var_unserializer.c"
+#line 1164 "ext/standard/var_unserializer.c"
yy76:
yych = *++YYCURSOR;
if (yych == 'N') goto yy73;
@@ -1186,7 +1187,7 @@ yy79:
if (yych <= '9') goto yy79;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 594 "ext/standard/var_unserializer.re"
+#line 595 "ext/standard/var_unserializer.re"
{
#if SIZEOF_ZEND_LONG == 4
int digits = YYCURSOR - start - 3;
@@ -1212,7 +1213,7 @@ yy79:
ZVAL_LONG(rval, parse_iv(start + 2));
return 1;
}
-#line 1216 "ext/standard/var_unserializer.c"
+#line 1217 "ext/standard/var_unserializer.c"
yy83:
yych = *++YYCURSOR;
if (yych <= '/') goto yy18;
@@ -1220,22 +1221,22 @@ yy83:
yych = *++YYCURSOR;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 588 "ext/standard/var_unserializer.re"
+#line 589 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
ZVAL_BOOL(rval, parse_iv(start + 2));
return 1;
}
-#line 1230 "ext/standard/var_unserializer.c"
+#line 1231 "ext/standard/var_unserializer.c"
yy87:
++YYCURSOR;
-#line 582 "ext/standard/var_unserializer.re"
+#line 583 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
ZVAL_NULL(rval);
return 1;
}
-#line 1239 "ext/standard/var_unserializer.c"
+#line 1240 "ext/standard/var_unserializer.c"
yy89:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -1258,7 +1259,7 @@ yy91:
if (yych <= '9') goto yy91;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 559 "ext/standard/var_unserializer.re"
+#line 560 "ext/standard/var_unserializer.re"
{
zend_long id;
@@ -1281,7 +1282,7 @@ yy91:
return 1;
}
-#line 1285 "ext/standard/var_unserializer.c"
+#line 1286 "ext/standard/var_unserializer.c"
yy95:
yych = *++YYCURSOR;
if (yych <= ',') {
@@ -1304,7 +1305,7 @@ yy97:
if (yych <= '9') goto yy97;
if (yych != ';') goto yy18;
++YYCURSOR;
-#line 537 "ext/standard/var_unserializer.re"
+#line 538 "ext/standard/var_unserializer.re"
{
zend_long id;
@@ -1326,9 +1327,9 @@ yy97:
return 1;
}
-#line 1330 "ext/standard/var_unserializer.c"
+#line 1331 "ext/standard/var_unserializer.c"
}
-#line 882 "ext/standard/var_unserializer.re"
+#line 883 "ext/standard/var_unserializer.re"
return 0;
diff --git a/ext/standard/var_unserializer..re b/ext/standard/var_unserializer.re
index dc2f84a..25c519e 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -474,12 +474,13 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, zend_long elements)
{
zval retval;
zval fname;
- HashTable *ht = Z_OBJPROP_P(rval);
+ HashTable *ht;
if (Z_TYPE_P(rval) != IS_OBJECT) {
return 0;
}
+ ht = Z_OBJPROP_P(rval);
zend_hash_resize(ht, zend_hash_num_elements(ht) + elements);
if (!process_nested_data(UNSERIALIZE_PASSTHRU, ht, elements, 1)) {
return 0;