com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/exif/exif.c ext/pcre/php_pcre.c ext/session/session.c ext/soap/so ap.c ext/spl/spl_dllist.c
ext/spl/spl_observer.c ext/standard/var.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/zip/php_zip.c

From: Date: Tue, 01 Sep 2015 19:06:41 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/exif/exif.c ext/pcre/php_pcre.c ext/session/session.c ext/soap/so ap.c ext/spl/spl_dllist.c
ext/spl/spl_observer.c ext/standard/var.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/zip/php_zip.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88840@lists.php.net to get a copy of this message
Commit: c19d59c550053ffa797fce59aadf7bc79727390c Author: Stanislav Malyshev <stas@php.net> Tue, 1 Sep 2015 12:06:41 -0700 Parents: 45e7e79485f27ed22feb206cfe360718c424bf1a 31b634bf7cb8e3de1dfa71418e348133c2365933 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c19d59c550053ffa797fce59aadf7bc79727390c Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: update NEWS add NEWS for fixes Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) 5.4.45 next Conflicts: ext/pcre/php_pcre.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/zip/php_zip.c Bugs: https://bugs.php.net/70172 https://bugs.php.net/70312 https://bugs.php.net/70366 https://bugs.php.net/70365 https://bugs.php.net/70388 https://bugs.php.net/70350 https://bugs.php.net/70385 https://bugs.php.net/70345 https://bugs.php.net/70219 https://bugs.php.net/69782 https://bugs.php.net/69085 Changed paths: MM ext/exif/exif.c MM ext/pcre/php_pcre.c MM ext/session/session.c MM ext/soap/soap.c MM ext/spl/spl_dllist.c MM ext/spl/spl_observer.c MM ext/standard/var.c MM ext/standard/var_unserializer.c MM ext/standard/var_unserializer.re MM ext/zip/php_zip.c

diff --cc ext/pcre/php_pcre.c index c55828b,cc7cd01..36d913d --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@@ -814,13 -787,13 +814,13 @@@ PHPAPI void php_pcre_match_impl(pcre_ca pcre_handle_exec_error(count TSRMLS_CC); break; } - + /* If we have matched an empty string, mimic what Perl's /g options does. - This turns out to be rather cunning. First we set PCRE_NOTEMPTY and try + This turns out to be rather cunning. First we set PCRE_NOTEMPTY_ATSTART and try the match again at the same point. If this fails (picked up above) we advance to the next character. */ - g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY | PCRE_ANCHORED : 0; - + g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY_ATSTART | PCRE_ANCHORED : 0; + /* Advance to the position right after the last full match */ start_offset = offsets[1]; } while (global); @@@ -836,12 -809,8 +836,12 @@@ zend_hash_next_index_insert(Z_ARRVAL_P(subpats), &match_sets[i], sizeof(zval *), NULL); } efree(match_sets); + + if (marks) { + add_assoc_zval(subpats, "MARK", marks); + } } - + efree(offsets); efree(subpat_names); @@@ -1293,13 -1254,13 +1293,13 @@@ PHPAPI char *php_pcre_replace_impl(pcre result = NULL; break; } - + /* If we have matched an empty string, mimic what Perl's /g options does. - This turns out to be rather cunning. First we set PCRE_NOTEMPTY and try + This turns out to be rather cunning. First we set PCRE_NOTEMPTY_ATSTART and try the match again at the same point. If this fails (picked up above) we advance to the next character. */ - g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY | PCRE_ANCHORED : 0; - + g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY_ATSTART | PCRE_ANCHORED : 0; + /* Advance to the next piece. */ start_offset = offsets[1]; } diff --cc ext/soap/soap.c index 65699b1,0e4f1dd..32420fd --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@@ -4014,10 -4017,10 +4016,10 @@@ static xmlDocPtr serialize_response_cal xmlChar *code = xmlBuildQName(BAD_CAST(str), nsptr->prefix, NULL, 0); xmlNodeSetContent(node, code); xmlFree(code); - } else { + } else { xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len); } - efree(str); + str_efree(str); } if (zend_hash_find(prop, "faultstring", sizeof("faultstring"), (void**)&tmp) == SUCCESS) { xmlNodePtr node = master_to_xml(get_conversion(IS_STRING), *tmp, SOAP_LITERAL, param TSRMLS_CC); @@@ -4040,10 -4043,10 +4042,10 @@@ xmlChar *code = xmlBuildQName(BAD_CAST(str), nsptr->prefix, NULL, 0); xmlNodeSetContent(node, code); xmlFree(code); - } else { + } else { xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len); } - efree(str); + str_efree(str); } if (zend_hash_find(prop, "faultstring", sizeof("faultstring"), (void**)&tmp) == SUCCESS) { xmlNodePtr node = xmlNewChild(param, ns, BAD_CAST("Reason"), NULL); diff --cc ext/standard/var_unserializer.c index ac17529,08ef139..575070b --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@@ -232,7 -242,7 +241,7 @@@ static char *unserialize_str(const unsi #define YYMARKER marker - #line 240 "ext/standard/var_unserializer.re" -#line 250 "ext/standard/var_unserializer.re" ++#line 249 "ext/standard/var_unserializer.re" @@@ -475,10 -484,10 +479,10 @@@ PHPAPI int php_var_unserialize(UNSERIAL start = cursor; - - - #line 482 "ext/standard/var_unserializer.c" + + -#line 491 "ext/standard/var_unserializer.c" ++#line 486 "ext/standard/var_unserializer.c" { YYCTYPE yych; static const unsigned char yybm[] = { @@@ -538,9 -547,9 +542,9 @@@ yy2 yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy95; yy3: - #line 833 "ext/standard/var_unserializer.re" -#line 845 "ext/standard/var_unserializer.re" ++#line 840 "ext/standard/var_unserializer.re" { return 0; } - #line 544 "ext/standard/var_unserializer.c" -#line 553 "ext/standard/var_unserializer.c" ++#line 548 "ext/standard/var_unserializer.c" yy4: yych = *(YYMARKER = ++YYCURSOR); if (yych == ':') goto yy89; @@@ -583,13 -592,13 +587,13 @@@ yy13 goto yy3; yy14: ++YYCURSOR; - #line 827 "ext/standard/var_unserializer.re" -#line 839 "ext/standard/var_unserializer.re" ++#line 834 "ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } - #line 593 "ext/standard/var_unserializer.c" -#line 602 "ext/standard/var_unserializer.c" ++#line 597 "ext/standard/var_unserializer.c" yy16: yych = *++YYCURSOR; goto yy3; @@@ -620,7 -629,7 +624,7 @@@ yy20 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 681 "ext/standard/var_unserializer.re" -#line 692 "ext/standard/var_unserializer.re" ++#line 687 "ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; long elements; @@@ -766,7 -776,7 +771,7 @@@ return object_common2(UNSERIALIZE_PASSTHRU, elements); } - #line 770 "ext/standard/var_unserializer.c" -#line 780 "ext/standard/var_unserializer.c" ++#line 775 "ext/standard/var_unserializer.c" yy25: yych = *++YYCURSOR; if (yych <= ',') { @@@ -791,15 -801,16 +796,16 @@@ yy27 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 673 "ext/standard/var_unserializer.re" -#line 683 "ext/standard/var_unserializer.re" ++#line 678 "ext/standard/var_unserializer.re" { + if (!var_hash) return 0; INIT_PZVAL(*rval); - + return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } - #line 803 "ext/standard/var_unserializer.c" -#line 814 "ext/standard/var_unserializer.c" ++#line 809 "ext/standard/var_unserializer.c" yy32: yych = *++YYCURSOR; if (yych == '+') goto yy33; @@@ -820,7 -831,7 +826,7 @@@ yy34 yych = *++YYCURSOR; if (yych != '{') goto yy18; ++YYCURSOR; - #line 653 "ext/standard/var_unserializer.re" -#line 662 "ext/standard/var_unserializer.re" ++#line 657 "ext/standard/var_unserializer.re" { long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ @@@ -840,7 -852,7 +847,7 @@@ return finish_nested_data(UNSERIALIZE_PASSTHRU); } - #line 844 "ext/standard/var_unserializer.c" -#line 856 "ext/standard/var_unserializer.c" ++#line 851 "ext/standard/var_unserializer.c" yy39: yych = *++YYCURSOR; if (yych == '+') goto yy40; @@@ -861,7 -873,7 +868,7 @@@ yy41 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 624 "ext/standard/var_unserializer.re" -#line 633 "ext/standard/var_unserializer.re" ++#line 628 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@@ -890,7 -902,7 +897,7 @@@ ZVAL_STRINGL(*rval, str, len, 0); return 1; } - #line 894 "ext/standard/var_unserializer.c" -#line 906 "ext/standard/var_unserializer.c" ++#line 901 "ext/standard/var_unserializer.c" yy46: yych = *++YYCURSOR; if (yych == '+') goto yy47; @@@ -911,7 -923,7 +918,7 @@@ yy48 yych = *++YYCURSOR; if (yych != '"') goto yy18; ++YYCURSOR; - #line 596 "ext/standard/var_unserializer.re" -#line 605 "ext/standard/var_unserializer.re" ++#line 600 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@@ -939,7 -951,7 +946,7 @@@ ZVAL_STRINGL(*rval, str, len, 1); return 1; } - #line 943 "ext/standard/var_unserializer.c" -#line 955 "ext/standard/var_unserializer.c" ++#line 950 "ext/standard/var_unserializer.c" yy53: yych = *++YYCURSOR; if (yych <= '/') { @@@ -1027,7 -1039,7 +1034,7 @@@ yy61 } yy63: ++YYCURSOR; - #line 586 "ext/standard/var_unserializer.re" -#line 595 "ext/standard/var_unserializer.re" ++#line 590 "ext/standard/var_unserializer.re" { #if SIZEOF_LONG == 4 use_double: @@@ -1037,7 -1049,7 +1044,7 @@@ ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); return 1; } - #line 1041 "ext/standard/var_unserializer.c" -#line 1053 "ext/standard/var_unserializer.c" ++#line 1048 "ext/standard/var_unserializer.c" yy65: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1096,7 -1108,7 +1103,7 @@@ yy73 yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 571 "ext/standard/var_unserializer.re" -#line 580 "ext/standard/var_unserializer.re" ++#line 575 "ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); @@@ -1111,7 -1123,7 +1118,7 @@@ return 1; } - #line 1115 "ext/standard/var_unserializer.c" -#line 1127 "ext/standard/var_unserializer.c" ++#line 1122 "ext/standard/var_unserializer.c" yy76: yych = *++YYCURSOR; if (yych == 'N') goto yy73; @@@ -1138,7 -1150,7 +1145,7 @@@ yy79 if (yych <= '9') goto yy79; if (yych != ';') goto yy18; ++YYCURSOR; - #line 544 "ext/standard/var_unserializer.re" -#line 553 "ext/standard/var_unserializer.re" ++#line 548 "ext/standard/var_unserializer.re" { #if SIZEOF_LONG == 4 int digits = YYCURSOR - start - 3; @@@ -1165,7 -1177,7 +1172,7 @@@ ZVAL_LONG(*rval, parse_iv(start + 2)); return 1; } - #line 1169 "ext/standard/var_unserializer.c" -#line 1181 "ext/standard/var_unserializer.c" ++#line 1176 "ext/standard/var_unserializer.c" yy83: yych = *++YYCURSOR; if (yych <= '/') goto yy18; @@@ -1173,24 -1185,24 +1180,24 @@@ yych = *++YYCURSOR; if (yych != ';') goto yy18; ++YYCURSOR; - #line 537 "ext/standard/var_unserializer.re" -#line 546 "ext/standard/var_unserializer.re" ++#line 541 "ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_BOOL(*rval, parse_iv(start + 2)); return 1; } - #line 1184 "ext/standard/var_unserializer.c" -#line 1196 "ext/standard/var_unserializer.c" ++#line 1191 "ext/standard/var_unserializer.c" yy87: ++YYCURSOR; - #line 530 "ext/standard/var_unserializer.re" -#line 539 "ext/standard/var_unserializer.re" ++#line 534 "ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_NULL(*rval); return 1; } - #line 1194 "ext/standard/var_unserializer.c" -#line 1206 "ext/standard/var_unserializer.c" ++#line 1201 "ext/standard/var_unserializer.c" yy89: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1213,7 -1225,7 +1220,7 @@@ yy91 if (yych <= '9') goto yy91; if (yych != ';') goto yy18; ++YYCURSOR; - #line 507 "ext/standard/var_unserializer.re" -#line 516 "ext/standard/var_unserializer.re" ++#line 511 "ext/standard/var_unserializer.re" { long id; @@@ -1233,10 -1245,10 +1240,10 @@@ *rval = *rval_ref; Z_ADDREF_PP(rval); Z_UNSET_ISREF_PP(rval); - + return 1; } - #line 1240 "ext/standard/var_unserializer.c" -#line 1252 "ext/standard/var_unserializer.c" ++#line 1247 "ext/standard/var_unserializer.c" yy95: yych = *++YYCURSOR; if (yych <= ',') { @@@ -1259,7 -1271,7 +1266,7 @@@ yy97 if (yych <= '9') goto yy97; if (yych != ';') goto yy18; ++YYCURSOR; - #line 486 "ext/standard/var_unserializer.re" -#line 495 "ext/standard/var_unserializer.re" ++#line 490 "ext/standard/var_unserializer.re" { long id; @@@ -1277,12 -1289,12 +1284,12 @@@ *rval = *rval_ref; Z_ADDREF_PP(rval); Z_SET_ISREF_PP(rval); - + return 1; } - #line 1284 "ext/standard/var_unserializer.c" -#line 1296 "ext/standard/var_unserializer.c" ++#line 1291 "ext/standard/var_unserializer.c" } - #line 835 "ext/standard/var_unserializer.re" -#line 847 "ext/standard/var_unserializer.re" ++#line 842 "ext/standard/var_unserializer.re" return 0;
« previous php.cvs (#88840) next »