com php-src: Merge branch 'PHP-5.4.45' into PHP-5.5.29: ext/session/session.c ext/standard/var_unserializer.c ext /standard/var_unserializer.re
ext/xsl/xsltprocessor.c
| From: | Stanislav Malyshev | Date: | Wed, 26 Aug 2015 06:08:49 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4.45' into PHP-5.5.29: ext/session/session.c ext/standard/var_unserializer.c ext /standard/var_unserializer.re ext/xsl/xsltprocessor.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88839@lists.php.net to get a copy of this message | ||
Commit: 24dda816d069a2e0cb5dc2985afd7f3269202946
Author: Stanislav Malyshev <stas@php.net> Tue, 25 Aug 2015 23:08:49 -0700
Parents: 15e9f4baf48f1a02091d1dbf505d9c6d561bc1d4 df4bf28f9f104ca3ef78ed94b497859f15b004e5
Branches: PHP-5.5.29
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24dda816d069a2e0cb5dc2985afd7f3269202946
Log:
Merge branch 'PHP-5.4.45' into PHP-5.5.29
* PHP-5.4.45:
Fix bug #70219 (Use after free vulnerability in session deserializer)
Fix for bug #69782
5.4.45 next
Conflicts:
configure.in
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_version.h
Bugs:
https://bugs.php.net/70219
https://bugs.php..net/69782
Changed paths:
MM ext/session/session.c
MM ext/standard/var_unserializer.c
MM ext/standard/var_unserializer.re
MM ext/xsl/xsltprocessor.c
Diff:
diff --cc ext/standard/var_unserializer.c
index 188d2da,ffaf680..1aa5ff3
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@@ -480,10 -481,10 +481,8 @@@ PHPAPI int php_var_unserialize(UNSERIAL
start = cursor;
-
-
-
-
-#line 488 "ext/standard/var_unserializer.c"
+#line 487 "ext/standard/var_unserializer.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@@@ -1238,10 -1239,10 +1237,10 @@@ yy91
*rval = *rval_ref;
Z_ADDREF_PP(rval);
Z_UNSET_ISREF_PP(rval);
-
+
return 1;
}
-#line 1246 "ext/standard/var_unserializer.c"
+#line 1245 "ext/standard/var_unserializer.c"
yy95:
yych = *++YYCURSOR;
if (yych <= ',') {
@@@ -1282,12 -1283,12 +1281,12 @@@ yy97
*rval = *rval_ref;
Z_ADDREF_PP(rval);
Z_SET_ISREF_PP(rval);
-
+
return 1;
}
-#line 1290 "ext/standard/var_unserializer.c"
+#line 1289 "ext/standard/var_unserializer.c"
}
-#line 841 "ext/standard/var_unserializer.re"
+#line 840 "ext/standard/var_unserializer.re"
return 0;