Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	php5.changes
@@ -1,13 +1,11 @@ ------------------------------------------------------------------- Wed Mar 11 15:13:12 UTC 2015 - cs@linux-administrator.com -- added php-CVE-2014-3597.patch - added php-CVE-2014-3668.patch - added php-CVE-2014-3669.patch - added php-CVE-2014-3670.patch - added php-CVE-2014-4670.patch - added php-CVE-2014-4698.patch -- added php-CVE-2014-4721.patch - added php-CVE-2014-8142.patch - added php-CVE-2014-9652.patch - added php-CVE-2015-0231.patch
[-] [+]	Changed	php5.spec ^
@@ -127,13 +127,12 @@ Patch21: php-5.3.4-session.patch Patch22: php-5.3.10-maillog-httphost.patch -Patch50: php-CVE-2014-3597.patch Patch51: php-CVE-2014-3668.patch Patch52: php-CVE-2014-3669.patch Patch53: php-CVE-2014-3670.patch Patch54: php-CVE-2014-4670.patch Patch55: php-CVE-2014-4698.patch -Patch56: php-CVE-2014-4721.patch +#Patch56: php-CVE-2014-4721.patch Patch57: php-CVE-2014-8142.patch Patch58: php-CVE-2014-9652.patch Patch59: php-CVE-2015-0231.patch @@ -1239,13 +1238,11 @@ %patch21 %patch22 -%patch50 %patch51 %patch52 %patch53 %patch54 %patch55 -%patch56 %patch57 %patch58 %patch59
[-] [+]	Changed	php-CVE-2015-0273.patch ^
@@ -1,18 +1,6 @@ -https://bugs.php.net/patch-display.php?bug=68942&patch=patch-5.4&revision=1422773336 -commit a812c1f5bf3edc986d9ed0a3810cd7bb9eca1330 -Author: Stanislav Malyshev <stas@php.net> -Date: Sat Jan 31 22:40:08 2015 -0800 - - Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) - - Conflicts: - ext/date/php_date.c - -Index: ext/date/php_date.c -=================================================================== ---- ext/date/php_date.c.orig 2015-02-25 09:20:30.425481283 +0100 -+++ ext/date/php_date.c 2015-02-25 09:24:57.483540522 +0100 -@@ -2539,15 +2539,12 @@ +--- ext/date/php_date.c.orig 2015-03-11 19:32:31.701148270 +0100 ++++ ext/date/php_date.c 2015-03-11 20:22:53.686790586 +0100 +@@ -2573,12 +2573,9 @@ timelib_tzinfo tzi; php_timezone_obj tzobj; @@ -21,32 +9,27 @@ - if (zend_hash_find(myht, "timezone_type", 14, (void*) &z_timezone_type) == SUCCESS) { - convert_to_long(z_timezone_type); - if (zend_hash_find(myht, "timezone", 9, (void) &z_timezone) == SUCCESS) { -+ if (zend_hash_find(myht, "date", 5, (void) &z_date) == SUCCESS && Z_TYPE_PP(z_date) == IS_STRING) { -+ if (zend_hash_find(myht, "timezone_type", 14, (void) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) { -+ if (zend_hash_find(myht, "timezone", 9, (void) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) { - zend_error_handling error_handling; - - zend_replace_error_handling(EH_THROW, NULL, &error_handling TSRMLS_CC); - convert_to_string(z_timezone); ++ if (zend_hash_find(myht, "date", 5, (void) &z_date) == SUCCESS && Z_TYPE_PP(z_date) == IS_STRING) { ++ if (zend_hash_find(myht, "timezone_type", 14, (void) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) { ++ if (zend_hash_find(myht, "timezone", 9, (void) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) { switch (Z_LVAL_PP(z_timezone_type)) { case TIMELIB_ZONETYPE_OFFSET: -@@ -2560,7 +2557,6 @@ - } +@@ -2593,7 +2590,6 @@ - case TIMELIB_ZONETYPE_ID: + case TIMELIB_ZONETYPE_ID: { + int ret; - convert_to_string(z_timezone); tzi = php_date_parse_tzfile(Z_STRVAL_PP(z_timezone), DATE_TIMEZONEDB TSRMLS_CC); -@@ -2617,7 +2613,9 @@ +@@ -2624,7 +2620,7 @@ - myht = Z_OBJPROP_P(object); + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) { + RETURN_FALSE; +- } ++} -- php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC); -+ if (!php_date_initialize_from_hash(&return_value, &dateobj, myht TSRMLS_CC)) { -+ php_error(E_ERROR, "Invalid serialization data for DateTime object"); -+ } - } - /* }}} */ + myht = HASH_OF(array);