com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/standard/ var_unserializer.c ext/standard/var_unserializer.re
| From: | Anatol Belski | Date: | Tue, 04 Jul 2017 14:38:12 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/standard/ var_unserializer.c ext/standard/var_unserializer.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98330@lists.php.net to get a copy of this message | ||
Commit: 41ba98f02d6ce4c7572ef2b7856defead7d232ac
Author: Anatol Belski <ab@php.net> Tue, 4 Jul 2017 16:38:12 +0200
Parents: 396c0f7a76c46159b30da4f4d3c422527a5c7b8b a29264eb8c933f8569e62f1d6d6eba524e76ef70
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=41ba98f02d6ce4c7572ef2b7856defead7d232ac
Log:
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix datatype
Changed paths:
MM ext/standard/var_unserializer.c
MM ext/standard/var_unserializer.re
Diff:
diff --cc ext/standard/var_unserializer.c
index ac024fd,f9ebbe0..1065751
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -1402,9 -1363,9 +1402,9 @@@ yy91
goto yy18;
yy92:
++YYCURSOR;
-#line 794 "ext/standard/var_unserializer.re"
+#line 833 "ext/standard/var_unserializer.re"
{
- long elements;
+ zend_long elements;
if (!var_hash) return 0;
elements = object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR);