From 131d7d7a89dda1d5677cccb37b69628ee784b1b4 Mon Sep 17 00:00:00 2001 From: Anatoliy Belsky Date: Fri, 12 Oct 2012 19:34:31 +0200 Subject: [PATCH 01/15] fixed tests for gd having freetype >= 2.4.10 --- ext/gd/tests/bug43073.phpt | 5 ++- ext/gd/tests/bug43073_1.phpt | 51 ++++++++++++++++++++++++++++++ ext/gd/tests/bug48801.phpt | 5 ++- ext/gd/tests/bug48801_1.phpt | 25 +++++++++++++++ ext/gd/tests/func.inc | 61 ++++++++++++++++++++++++++++++++++++ 5 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 ext/gd/tests/bug43073_1.phpt create mode 100644 ext/gd/tests/bug48801_1.phpt create mode 100644 ext/gd/tests/func.inc diff --git a/ext/gd/tests/bug43073.phpt b/ext/gd/tests/bug43073.phpt index df4ffe37e8b..4f448f2b4ab 100644 --- a/ext/gd/tests/bug43073.phpt +++ b/ext/gd/tests/bug43073.phpt @@ -1,9 +1,12 @@ --TEST-- -Bug #43073 (TrueType bounding box is wrong for angle<>0) +Bug #43073 (TrueType bounding box is wrong for angle<>0) freetype < 2.4.10 --SKIPIF-- = 0) die('skip for freetype < 2.4.10'); ?> --FILE-- 0) freetype >= 2.4.10 +--SKIPIF-- += 2.4.10'); +?> +--FILE-- + +--CLEAN-- + +--EXPECTF-- +(500, 400), (610, 400), (610, 376), (500, 376) +(492, 363), (591, 322), (580, 295), (480, 336) +(470, 331), (548, 254), (527, 233), (449, 310) +(439, 309), (483, 202), (461, 193), (416, 299) +(400, 300), (400, 183), (380, 183), (380, 300) +(362, 307), (316, 195), (291, 205), (337, 318) +(330, 329), (246, 244), (224, 265), (308, 350) +(308, 360), (202, 316), (190, 344), (296, 388) +(300, 400), (187, 400), (187, 425), (300, 425) +(306, 437), (195, 483), (206, 510), (318, 464) +(328, 469), (240, 557), (260, 578), (349, 491) +(359, 491), (312, 607), (334, 616), (382, 501) +(400, 500), (400, 618), (419, 618), (419, 500) +(436, 493), (483, 607), (507, 597), (461, 482) +(468, 471), (555, 558), (577, 538), (490, 450) +(490, 440), (600, 485), (611, 457), (502, 412) diff --git a/ext/gd/tests/bug48801.phpt b/ext/gd/tests/bug48801.phpt index a6a9874ab80..fd25541a520 100644 --- a/ext/gd/tests/bug48801.phpt +++ b/ext/gd/tests/bug48801.phpt @@ -1,9 +1,12 @@ --TEST-- -Bug #48801 (Problem with imagettfbbox) +Bug #48801 (Problem with imagettfbbox) freetype < 2.4.10 --SKIPIF-- = 0) die('skip for freetype < 2.4.10'); ?> --FILE-- = 2.4.10 +--SKIPIF-- += 2.4.10'); +?> +--FILE-- + +--EXPECTF-- +(-1, 15) +(156, 15) +(156, -48) +(-1, -48) diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc new file mode 100644 index 00000000000..f17227eccda --- /dev/null +++ b/ext/gd/tests/func.inc @@ -0,0 +1,61 @@ + (\d+\.\d+\.\d+),s', get_php_info(), $match)) { + $version = $match[1]; + } + + return $version; +} + +function get_libjpeg_version() +{ + $version = 0; + + if (preg_match(',libJPEG Version => ([a-z0-9]+),s', get_php_info(), $match)) { + $version = $match[1]; + } + + return $version; +} + +function get_libpng_version() +{ + $version = 0; + + if (preg_match(',libPNG Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) { + $version = $match[1]; + } + + return $version; +} + +function get_libxpm_version() +{ + $version = 0; + + if (preg_match(',libXpm Version => (\d+),s', get_php_info(), $match)) { + $version = $match[1]; + } + + return $version; +} + From 5020b51d72d3e7ee38f366ef3685ce2c8e9b13c1 Mon Sep 17 00:00:00 2001 From: Anatoliy Belsky Date: Fri, 12 Oct 2012 19:50:35 +0200 Subject: [PATCH 02/15] extended the SKIPIF section with ICU 49 (sync with 5.4 branch) --- ext/intl/tests/locale_get_display_script2.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/intl/tests/locale_get_display_script2.phpt b/ext/intl/tests/locale_get_display_script2.phpt index 92652bde906..af4834ad0fc 100644 --- a/ext/intl/tests/locale_get_display_script2.phpt +++ b/ext/intl/tests/locale_get_display_script2.phpt @@ -2,7 +2,7 @@ locale_get_display_script() icu >= 4.8 --SKIPIF-- - += 0) print 'skip'; ?> --FILE-- Date: Fri, 12 Oct 2012 20:00:37 +0200 Subject: [PATCH 03/15] Fix bug #63240 on stream_get_line() stream_get_line() could contain the delimiter string if that string had more than one character. The bug manifested itself when a read on the stream ended with part of the delimiter string and the read after would start with the rest of the delimiter string; provided that the data of first read did not complete the max length result of the call to stream_get_line() with the partial delimiter used in that max length return. In that case, the delimiter will still appear in the result, divided in two subsequent return values. That is not a bug. See --- ext/standard/tests/streams/bug63240.phpt | 17 +++++++++++++++++ main/streams/streams.c | 12 ++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 ext/standard/tests/streams/bug63240.phpt diff --git a/ext/standard/tests/streams/bug63240.phpt b/ext/standard/tests/streams/bug63240.phpt new file mode 100644 index 00000000000..7612c437454 --- /dev/null +++ b/ext/standard/tests/streams/bug63240.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #63240: stream_get_line() return contains delimiter string +--FILE-- + +--EXPECT-- +int(8191) +string(4) "rest" diff --git a/main/streams/streams.c b/main/streams/streams.c index dfd60940fca..eec9b703499 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -989,9 +989,17 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re if (has_delim) { /* search for delimiter, but skip buffered_len (the number of bytes * buffered before this loop iteration), as they have already been - * searched for the delimiter */ + * searched for the delimiter. + * The left part of the delimiter may still remain in the buffer, + * so subtract up to from buffered_len, which is + * the ammount of data we skip on this search as an optimization + */ found_delim = _php_stream_search_delim( - stream, maxlen, buffered_len, delim, delim_len TSRMLS_CC); + stream, maxlen, + buffered_len >= (delim_len - 1) + ? buffered_len - (delim_len - 1) + : 0, + delim, delim_len TSRMLS_CC); if (found_delim) { break; } From 519f93ef99d41d5720e76a08c6b64ffa927d184b Mon Sep 17 00:00:00 2001 From: Gustavo Lopes Date: Fri, 12 Oct 2012 20:27:53 +0200 Subject: [PATCH 04/15] NEWS for 76601c4 --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 46c9bf49094..fb7f83e7d96 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,10 @@ PHP NEWS . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec). (Martin Osvald, Remi) +- Streams: + . Fixed bug #63240 (stream_get_line() return contains delimiter string). + (Tjerk, Gustavo) + ?? ??? 2012, PHP 5.3.18 (NOTE: Add your entries above for 5.3.19, entries for 5.3.18 should only From 20e76f4487baf60dc52b348e86bae4628026c4c2 Mon Sep 17 00:00:00 2001 From: ULF WENDEL Date: Sat, 29 Sep 2012 12:10:24 +0200 Subject: [PATCH 05/15] Minor changes for MySQL 5.6 --- ext/mysql/tests/mysql_field_flags.phpt | 8 ++++++-- ext/mysql/tests/mysql_stat.phpt | 4 ++-- ext/mysqli/tests/bug55859.phpt | 4 ++-- ext/mysqli/tests/mysqli_class_mysqli_interface.phpt | 2 +- ext/mysqli/tests/mysqli_fetch_field_flags.phpt | 6 ++++++ ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt | 2 +- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ext/mysql/tests/mysql_field_flags.phpt b/ext/mysql/tests/mysql_field_flags.phpt index 6489affc16e..e07e041d2a3 100644 --- a/ext/mysql/tests/mysql_field_flags.phpt +++ b/ext/mysql/tests/mysql_field_flags.phpt @@ -81,13 +81,17 @@ $tables = array( array('label1', sprintf("'%s'", @date("Y-m-d H:i:s"))), 'label1' => array( 'timestamp', - 'unsigned', - 'zerofill', 'binary', 'not_null'), ), ); +if ($version < 560) { + $tables['label1 TIMESTAMP']['label1'][] = 'zerofill'; + $tables['label1 TIMESTAMP']['label1'][] = 'unsigned'; +} + + foreach ($tables as $columns => $expected) { if (!mysql_query("DROP TABLE IF EXISTS test", $link)) { printf("[010/%s] [%d] %s\n", $columns, mysql_errno($link), mysql_error($link)); diff --git a/ext/mysql/tests/mysql_stat.phpt b/ext/mysql/tests/mysql_stat.phpt index 288c53f067f..30a840a2a15 100644 --- a/ext/mysql/tests/mysql_stat.phpt +++ b/ext/mysql/tests/mysql_stat.phpt @@ -34,7 +34,7 @@ if ((!is_string($stat_def = mysql_stat())) || ('' === $stat_def)) printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n", gettype($stat_def), $stat_def, mysql_errno(), mysql_error()); -assert($stat === $stat_def); +assert(soundex($stat) === soundex($stat_def)); mysql_close($link); @@ -45,4 +45,4 @@ print "done!"; ?> --EXPECTF-- Warning: mysql_stat(): %d is not a valid MySQL-Link resource in %s on line %d -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/bug55859.phpt b/ext/mysqli/tests/bug55859.phpt index a8bb4b3f24a..ba6e9902b34 100644 --- a/ext/mysqli/tests/bug55859.phpt +++ b/ext/mysqli/tests/bug55859.phpt @@ -12,9 +12,9 @@ require_once('skipifconnectfailure.inc'); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); } - var_dump(mysqli_stat($link) === $link->stat); + var_dump(soundex(mysqli_stat($link)) === soundex($link->stat)); echo "done!"; ?> --EXPECT-- bool(true) -done! \ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt index c6d4e7cc328..df7d1c65807 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt @@ -211,7 +211,7 @@ require_once('skipifconnectfailure.inc'); $mysqli->sqlstate, gettype($mysqli->sqlstate), mysqli_sqlstate($link), gettype(mysqli_sqlstate($link))); - assert(mysqli_stat($link) === $mysqli->stat); + assert(soundex(mysqli_stat($link)) == soundex($mysqli->stat)); printf("mysqli->stat = '%s'/%s ('%s'/%s)\n", $mysqli->stat, gettype($mysqli->stat), mysqli_stat($link), gettype(mysqli_stat($link))); diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index 42cbc1487fe..8259d2f505b 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -84,6 +84,8 @@ mysqli_close($link); 'VARCHAR(2) NOT NULL PRIMARY KEY' => 'NOT_NULL PRI_KEY NO_DEFAULT_VALUE PART_KEY' ); + + function checkFlags($reported_flags, $expected_flags, $flags) { $found_flags = $unexpected_flags = ''; foreach ($flags as $code => $name) { @@ -104,6 +106,10 @@ mysqli_close($link); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + if (mysqli_get_server_version($link) > 50600) { + $columns['TIMESTAMP NOT NULL'] = 'ON_UPDATE_NOW TIMESTAMP BINARY NOT_NULL'; + } + foreach ($columns as $column_def => $expected_flags) { if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { printf("[002] %s [%d] %s\n", $column_def, diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt index 3c21d0f3216..4d0868ae7d4 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_attr_server_info.phpt @@ -23,7 +23,7 @@ $db = MySQLPDOTest::factory(); printf("[002] Wonderful, I can change the client version!\n"); $new_info = $db->getAttribute(PDO::ATTR_SERVER_INFO); - if ($new_info !== $info) + if (soundex($new_info) != soundex($info)) printf("[003] Did we change it from '%s' to '%s'?\n", $info, $info); // lets hope we always run this in the same second as we did run the server info request... From da541ff561e0ac6ac72d2efd8b785ecfeef868dc Mon Sep 17 00:00:00 2001 From: ULF WENDEL Date: Sat, 29 Sep 2012 18:54:54 +0200 Subject: [PATCH 06/15] Cover have_ssl=NO and have_ssl=DISABLED --- ext/mysqli/tests/bug51647.phpt | 4 ++-- ext/mysqli/tests/bug55283.phpt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt index b1c1e87a772..78540f1c33a 100644 --- a/ext/mysqli/tests/bug51647.phpt +++ b/ext/mysqli/tests/bug51647.phpt @@ -24,12 +24,12 @@ if ($res = $link->query('SHOW VARIABLES LIKE "have_ssl"')) { die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error)); } } - + if (empty($row)) die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error)); -if ($row[1] == 'NO') +if (($row[1] == 'NO') || ($row[1] == 'DISABLED')) die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno, $link->error)); $link->close(); diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt index 6000fce0a9b..d03daaee88e 100644 --- a/ext/mysqli/tests/bug55283.phpt +++ b/ext/mysqli/tests/bug55283.phpt @@ -29,7 +29,7 @@ if ($res = $link->query('SHOW VARIABLES LIKE "have_ssl"')) { if (empty($row)) die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error)); -if ($row[1] == 'NO') +if (($row[1] == 'NO') || ($row[1] == 'DISABLED')) die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno, $link->error)); $link->close(); @@ -41,7 +41,7 @@ $link->close(); $flags = MYSQLI_CLIENT_SSL; - + $link = mysqli_init(); mysqli_ssl_set($link, null, null, null, null, "RC4-MD5"); if (my_mysqli_real_connect($link, 'p:' . $host, $user, $passwd, $db, $port, null, $flags)) { From c50d732f7686352381d44926988aca194204433d Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Wed, 17 Oct 2012 17:22:31 +0200 Subject: [PATCH 07/15] fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql --- NEWS | 3 +++ ext/mysql/config.m4 | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/NEWS b/NEWS index 3d156c17885..f9098179408 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,9 @@ PHP NEWS (reeze.xia@gmail.com) . Fixed bug #62500 (Segfault in DateInterval class when extended). (Laruence) +- mysql: + . Fixed compilation failure on mixed 32/64 bit systems. (Andrey) + - MySQLnd: . Fixed bug #62885 (mysqli_poll - Segmentation fault). (Laruence) diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index 2babcee827d..e7d598fe05d 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -98,6 +98,13 @@ Note that the MySQL client library is not bundled anymore!]) MYSQL_LIB_CHK($i) done + if test -z "$MYSQL_LIB_DIR"; then + MYSQL_LIB_CHK(lib/x86_64-linux-gnu) + fi + if test -z "$MYSQL_LIB_DIR"; then + MYSQL_LIB_CHK(lib/i386-linux-gnu) + fi + if test -z "$MYSQL_LIB_DIR"; then AC_MSG_ERROR([Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR. Note that the MySQL client library is not bundled anymore!]) From 505836e9999958c9779b1de180197047d9b334d1 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Wed, 17 Oct 2012 17:56:17 +0200 Subject: [PATCH 08/15] fix NEWS --- NEWS | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 9c8c9c2bd1c..efb0c2ac948 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2012, PHP 5.3.19 +- mysql: + . Fixed compilation failure on mixed 32/64 bit systems. (Andrey) + - PDO: . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec). (Martin Osvald, Remi) @@ -66,12 +69,13 @@ be added after merge by RM) - CURL: . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick) - -- Intl: - . Fix null pointer dereferences in some classes of ext/intl. (Gustavo) - -- mysql: - . Fixed compilation failure on mixed 32/64 bit systems. (Andrey) + . Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false). + (r.hampartsumyan@gmail.com, Laruence) + + - DateTime: + . Fixed bug #62852 (Unserialize invalid DateTime causes crash). + (reeze.xia@gmail.com) + . Fixed bug #62500 (Segfault in DateInterval class when extended). (Laruence) - MySQLnd: . Fixed bug #62885 (mysqli_poll - Segmentation fault). (Laruence) From 3899adb46feb7a2dbd8f976ee02218b994c9f9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Wed, 17 Oct 2012 18:25:40 +0200 Subject: [PATCH 09/15] PHP 5.3.18 NEWS --- NEWS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/NEWS b/NEWS index efb0c2ac948..86f86296422 100644 --- a/NEWS +++ b/NEWS @@ -13,10 +13,7 @@ PHP NEWS . Fixed bug #63240 (stream_get_line() return contains delimiter string). (Tjerk, Gustavo) -?? ??? 2012, PHP 5.3.18 - -(NOTE: Add your entries above for 5.3.19, entries for 5.3.18 should only -be added after merge by RM) +18 Oct 2012, PHP 5.3.18 - Core: . Fixed bug #63111 (is_callable() lies for abstract static method). (Dmitry) From 8bd5e15ff7a57791956c4017ee8fb4a8ac0d8d2e Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 18 Oct 2012 17:31:27 +0800 Subject: [PATCH 10/15] Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite) --- NEWS | 6 +++++- ext/pcre/php_pcre.c | 3 ++- ext/pcre/tests/bug63055.phpt | 23 +++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 ext/pcre/tests/bug63055.phpt diff --git a/NEWS b/NEWS index 86f86296422..009f082bd07 100644 --- a/NEWS +++ b/NEWS @@ -2,9 +2,13 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2012, PHP 5.3.19 -- mysql: +- MySQL: . Fixed compilation failure on mixed 32/64 bit systems. (Andrey) +- PCRE: + . Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite). + (Dmitry, Laruence) + - PDO: . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec). (Martin Osvald, Remi) diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index b1b9e66e9af..1af81512515 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -547,8 +547,9 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec /* Overwrite the passed-in value for subpatterns with an empty array. */ if (subpats != NULL) { - zval_dtor(subpats); + zval garbage = *subpats; array_init(subpats); + zval_dtor(&garbage); } subpats_order = global ? PREG_PATTERN_ORDER : 0; diff --git a/ext/pcre/tests/bug63055.phpt b/ext/pcre/tests/bug63055.phpt new file mode 100644 index 00000000000..16c50b54e5e --- /dev/null +++ b/ext/pcre/tests/bug63055.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #63055 (Segfault in zend_gc with SF2 testsuite) +--FILE-- + "bar"); /* this bucket will trigger the segfault */ +$dummy = array("dummy"); /* used to trigger gc_collect_cycles */ +$dummy[1] = &$dummy; + +$matches[1] = &$matches; +$matches[2] = $dummy; + +preg_match_all("/(\d)+/", "foo123456bar", $matches); +echo "okey"; +?> +--EXPECTF-- +okey From e88cdaa0143aacd2d765eb0560452ea28e327e41 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 18 Oct 2012 20:10:35 +0800 Subject: [PATCH 11/15] better fix for #63055 --- Zend/zend_variables.c | 2 ++ ext/pcre/php_pcre.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index c7901085f8a..2b2ca0f2d10 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -40,6 +40,8 @@ ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC) TSRMLS_FETCH(); if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) { + /* break possible cycles */ + Z_TYPE_P(zvalue) = IS_NULL; zend_hash_destroy(zvalue->value.ht); FREE_HASHTABLE(zvalue->value.ht); } diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 1af81512515..736a70871a0 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -547,9 +547,8 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec /* Overwrite the passed-in value for subpatterns with an empty array. */ if (subpats != NULL) { - zval garbage = *subpats; + zval_dtor(subpats); array_init(subpats); - zval_dtor(&garbage); } subpats_order = global ? PREG_PATTERN_ORDER : 0; From db2dc7a6a48982b8a483861a7fa1de0d634bc3a4 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 18 Oct 2012 20:13:14 +0800 Subject: [PATCH 12/15] indent --- ext/pcre/php_pcre.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 736a70871a0..b1b9e66e9af 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -547,7 +547,7 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, int subjec /* Overwrite the passed-in value for subpatterns with an empty array. */ if (subpats != NULL) { - zval_dtor(subpats); + zval_dtor(subpats); array_init(subpats); } From 0d7965f0a32dc967a1665d274cdc0e39d44c87bb Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Thu, 18 Oct 2012 23:29:33 +0800 Subject: [PATCH 13/15] Merge the fix for #61964 to 5.3, which will fix #63304 --- ext/fileinfo/libmagic/apprentice.c | 27 +++++++++--- ext/fileinfo/tests/bug61964.phpt | 69 ++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 ext/fileinfo/tests/bug61964.phpt diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c index 4a54849e070..98bde27a2d7 100644 --- a/ext/fileinfo/libmagic/apprentice.c +++ b/ext/fileinfo/libmagic/apprentice.c @@ -753,7 +753,7 @@ private int apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, const char *fn, int action) { - int errs = 0; + int errs = 0, mflen = 0; struct magic_entry *marray; uint32_t marraycount, i, mentrycount = 0, starttest; size_t files = 0, maxfiles = 0; @@ -782,7 +782,7 @@ apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, goto out; } while ((d = readdir(dir)) != NULL) { - if (snprintf(mfn, sizeof(mfn), "%s/%s", fn, d->d_name) < 0) { + if ((mflen = snprintf(mfn, sizeof(mfn), "%s/%s", fn, d->d_name)) < 0) { file_oomem(ms, strlen(fn) + strlen(d->d_name) + 2); errs++; @@ -804,14 +804,14 @@ apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, goto out; } } - filearr[files++] = mfn; + filearr[files++] = estrndup(mfn, mflen); } closedir(dir); qsort(filearr, files, sizeof(*filearr), cmpstrp); for (i = 0; i < files; i++) { load_1(ms, action, filearr[i], &errs, &marray, &marraycount); - free(filearr[i]); + efree(filearr[i]); } free(filearr); } else @@ -886,9 +886,14 @@ apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, mentrycount += marray[i].cont_count; } out: - for (i = 0; i < marraycount; i++) - efree(marray[i].mp); - efree(marray); + for (i = 0; i < marraycount; i++) { + if (marray[i].mp) { + efree(marray[i].mp); + } + } + if (marray) { + efree(marray); + } if (errs) { *magicp = NULL; *nmagicp = 0; @@ -1165,6 +1170,9 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp, return -1; } me = &(*mentryp)[*nmentryp - 1]; + if (me->mp == NULL) { + return -1; + } if (me->cont_count == me->max_count) { struct magic *nm; size_t cnt = me->max_count + ALLOC_CHUNK; @@ -1329,6 +1337,10 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp, if (m->type == FILE_INVALID) { if (ms->flags & MAGIC_CHECK) file_magwarn(ms, "type `%s' invalid", l); + if (me->mp) { + efree(me->mp); + me->mp = NULL; + } return -1; } @@ -2219,6 +2231,7 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp, mm = emalloc((size_t)st.sb.st_size); if (php_stream_read(stream, mm, (size_t)st.sb.st_size) != (size_t)st.sb.st_size) { file_badread(ms); + ret = 1; goto error1; } ret = 1; diff --git a/ext/fileinfo/tests/bug61964.phpt b/ext/fileinfo/tests/bug61964.phpt new file mode 100644 index 00000000000..99c8fd2ae3e --- /dev/null +++ b/ext/fileinfo/tests/bug61964.phpt @@ -0,0 +1,69 @@ +--TEST-- +Bug #61964 (finfo_open with directory cause invalid free) +--SKIPIF-- + +--FILE-- + Core\n> Me"); +file_put_contents($dir . "/test2.txt", "a\nb\n"); +@mkdir($dir . "/test-inner-folder"); + +finfo_open(FILEINFO_NONE, $dir); +echo "DONE: testing dir with files\n"; + +rmdir($dir . "/test-inner-folder"); +unlink($dir . "/test1.txt"); +unlink($dir . "/test2.txt"); + +unlink($magic_file_copy); +unlink($magic_file_copy2); +rmdir($dir); +?> +===DONE=== +--EXPECTF-- +bool(false) +resource(%d) of type (file_info) +resource(%d) of type (file_info) +bool(false) + +Notice: finfo_open(): Warning: offset `string' invalid in %sbug61964.php on line %d + +Notice: finfo_open(): Warning: offset ` Core' invalid in %sbug61964.php on line %d + +Notice: finfo_open(): Warning: type `Core' invalid in %sbug61964.php on line %d + +Notice: finfo_open(): Warning: offset `a' invalid in %sbug61964.php on line %d + +Notice: finfo_open(): Warning: type `a' invalid in %sbug61964.php on line %d + +Notice: finfo_open(): Warning: offset `b' invalid in %sbug61964.php on line %d + +Notice: finfo_open(): Warning: type `b' invalid in %sbug61964.php on line %d + +Warning: finfo_open(): Failed to load magic database at '%stest-folder'. in %sbug61964.php on line %d +DONE: testing dir with files +===DONE=== From 7aed21c55753d2cfb5dc66e47b1a7396333e566f Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Thu, 18 Oct 2012 17:53:21 +0100 Subject: [PATCH 14/15] SUpport newer bisons. --- Zend/acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4 index 97d5d647bb2..136d2d8befe 100644 --- a/Zend/acinclude.m4 +++ b/Zend/acinclude.m4 @@ -4,7 +4,7 @@ dnl This file contains local autoconf functions. AC_DEFUN([LIBZEND_BISON_CHECK],[ # we only support certain bison versions - bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5" + bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2" # for standalone build of Zend Engine test -z "$SED" && SED=sed From 8f7a6c3029bd1f5731492aa9897c26f421961191 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Thu, 18 Oct 2012 21:53:03 +0100 Subject: [PATCH 15/15] - Updated to version 2012.7 (2012g) --- ext/date/lib/timezonedb.h | 174 +++++++++++++++++++++----------------- 1 file changed, 95 insertions(+), 79 deletions(-) diff --git a/ext/date/lib/timezonedb.h b/ext/date/lib/timezonedb.h index cee077bab4e..6f52cbf5728 100644 --- a/ext/date/lib/timezonedb.h +++ b/ext/date/lib/timezonedb.h @@ -507,77 +507,77 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[576] = { { "NZ" , 0x038F1A }, { "NZ-CHAT" , 0x039298 }, { "Pacific/Apia" , 0x039580 }, - { "Pacific/Auckland" , 0x03961D }, - { "Pacific/Chatham" , 0x0399A9 }, - { "Pacific/Chuuk" , 0x039CA0 }, - { "Pacific/Easter" , 0x039CF9 }, - { "Pacific/Efate" , 0x03A057 }, - { "Pacific/Enderbury" , 0x03A11D }, - { "Pacific/Fakaofo" , 0x03A18B }, - { "Pacific/Fiji" , 0x03A1DC }, - { "Pacific/Funafuti" , 0x03A36F }, - { "Pacific/Galapagos" , 0x03A3B3 }, - { "Pacific/Gambier" , 0x03A42B }, - { "Pacific/Guadalcanal" , 0x03A490 }, - { "Pacific/Guam" , 0x03A4E5 }, - { "Pacific/Honolulu" , 0x03A53B }, - { "Pacific/Johnston" , 0x03A5B2 }, - { "Pacific/Kiritimati" , 0x03A604 }, - { "Pacific/Kosrae" , 0x03A66F }, - { "Pacific/Kwajalein" , 0x03A6CC }, - { "Pacific/Majuro" , 0x03A738 }, - { "Pacific/Marquesas" , 0x03A797 }, - { "Pacific/Midway" , 0x03A7FE }, - { "Pacific/Nauru" , 0x03A888 }, - { "Pacific/Niue" , 0x03A900 }, - { "Pacific/Norfolk" , 0x03A95E }, - { "Pacific/Noumea" , 0x03A9B3 }, - { "Pacific/Pago_Pago" , 0x03AA43 }, - { "Pacific/Palau" , 0x03AACC }, - { "Pacific/Pitcairn" , 0x03AB10 }, - { "Pacific/Pohnpei" , 0x03AB65 }, - { "Pacific/Ponape" , 0x03ABBA }, - { "Pacific/Port_Moresby" , 0x03ABFF }, - { "Pacific/Rarotonga" , 0x03AC43 }, - { "Pacific/Saipan" , 0x03AD1F }, - { "Pacific/Samoa" , 0x03AD82 }, - { "Pacific/Tahiti" , 0x03AE0B }, - { "Pacific/Tarawa" , 0x03AE70 }, - { "Pacific/Tongatapu" , 0x03AEC4 }, - { "Pacific/Truk" , 0x03AF50 }, - { "Pacific/Wake" , 0x03AF95 }, - { "Pacific/Wallis" , 0x03AFE5 }, - { "Pacific/Yap" , 0x03B029 }, - { "Poland" , 0x03B06E }, - { "Portugal" , 0x03B44F }, - { "PRC" , 0x03B94B }, - { "PST8PDT" , 0x03B9FC }, - { "ROC" , 0x03BD4D }, - { "ROK" , 0x03BE65 }, - { "Singapore" , 0x03BF09 }, - { "Turkey" , 0x03BFC0 }, - { "UCT" , 0x03C3AD }, - { "Universal" , 0x03C3F1 }, - { "US/Alaska" , 0x03C435 }, - { "US/Aleutian" , 0x03C79E }, - { "US/Arizona" , 0x03CB04 }, - { "US/Central" , 0x03CB92 }, - { "US/East-Indiana" , 0x03D59C }, - { "US/Eastern" , 0x03D09D }, - { "US/Hawaii" , 0x03D806 }, - { "US/Indiana-Starke" , 0x03D877 }, - { "US/Michigan" , 0x03DBE8 }, - { "US/Mountain" , 0x03DF1F }, - { "US/Pacific" , 0x03E298 }, - { "US/Pacific-New" , 0x03E69D }, - { "US/Samoa" , 0x03EAA2 }, - { "UTC" , 0x03EB2B }, - { "W-SU" , 0x03EE22 }, - { "WET" , 0x03EB6F }, - { "Zulu" , 0x03F05C }, + { "Pacific/Auckland" , 0x03971C }, + { "Pacific/Chatham" , 0x039AA8 }, + { "Pacific/Chuuk" , 0x039D9F }, + { "Pacific/Easter" , 0x039DF8 }, + { "Pacific/Efate" , 0x03A156 }, + { "Pacific/Enderbury" , 0x03A21C }, + { "Pacific/Fakaofo" , 0x03A28A }, + { "Pacific/Fiji" , 0x03A2DB }, + { "Pacific/Funafuti" , 0x03A46E }, + { "Pacific/Galapagos" , 0x03A4B2 }, + { "Pacific/Gambier" , 0x03A52A }, + { "Pacific/Guadalcanal" , 0x03A58F }, + { "Pacific/Guam" , 0x03A5E4 }, + { "Pacific/Honolulu" , 0x03A63A }, + { "Pacific/Johnston" , 0x03A6B1 }, + { "Pacific/Kiritimati" , 0x03A703 }, + { "Pacific/Kosrae" , 0x03A76E }, + { "Pacific/Kwajalein" , 0x03A7CB }, + { "Pacific/Majuro" , 0x03A837 }, + { "Pacific/Marquesas" , 0x03A896 }, + { "Pacific/Midway" , 0x03A8FD }, + { "Pacific/Nauru" , 0x03A987 }, + { "Pacific/Niue" , 0x03A9FF }, + { "Pacific/Norfolk" , 0x03AA5D }, + { "Pacific/Noumea" , 0x03AAB2 }, + { "Pacific/Pago_Pago" , 0x03AB42 }, + { "Pacific/Palau" , 0x03ABCB }, + { "Pacific/Pitcairn" , 0x03AC0F }, + { "Pacific/Pohnpei" , 0x03AC64 }, + { "Pacific/Ponape" , 0x03ACB9 }, + { "Pacific/Port_Moresby" , 0x03ACFE }, + { "Pacific/Rarotonga" , 0x03AD42 }, + { "Pacific/Saipan" , 0x03AE1E }, + { "Pacific/Samoa" , 0x03AE81 }, + { "Pacific/Tahiti" , 0x03AF0A }, + { "Pacific/Tarawa" , 0x03AF6F }, + { "Pacific/Tongatapu" , 0x03AFC3 }, + { "Pacific/Truk" , 0x03B04F }, + { "Pacific/Wake" , 0x03B094 }, + { "Pacific/Wallis" , 0x03B0E4 }, + { "Pacific/Yap" , 0x03B128 }, + { "Poland" , 0x03B16D }, + { "Portugal" , 0x03B54E }, + { "PRC" , 0x03BA4A }, + { "PST8PDT" , 0x03BAFB }, + { "ROC" , 0x03BE4C }, + { "ROK" , 0x03BF64 }, + { "Singapore" , 0x03C008 }, + { "Turkey" , 0x03C0BF }, + { "UCT" , 0x03C4AC }, + { "Universal" , 0x03C4F0 }, + { "US/Alaska" , 0x03C534 }, + { "US/Aleutian" , 0x03C89D }, + { "US/Arizona" , 0x03CC03 }, + { "US/Central" , 0x03CC91 }, + { "US/East-Indiana" , 0x03D69B }, + { "US/Eastern" , 0x03D19C }, + { "US/Hawaii" , 0x03D905 }, + { "US/Indiana-Starke" , 0x03D976 }, + { "US/Michigan" , 0x03DCE7 }, + { "US/Mountain" , 0x03E01E }, + { "US/Pacific" , 0x03E397 }, + { "US/Pacific-New" , 0x03E79C }, + { "US/Samoa" , 0x03EBA1 }, + { "UTC" , 0x03EC2A }, + { "W-SU" , 0x03EF21 }, + { "WET" , 0x03EC6E }, + { "Zulu" , 0x03F15B }, }; /* This is a generated file, do not modify */ -const unsigned char timelib_timezone_db_data_builtin[258208] = { +const unsigned char timelib_timezone_db_data_builtin[258463] = { /* Africa/Abidjan */ @@ -8085,7 +8085,7 @@ const unsigned char timelib_timezone_db_data_builtin[258208] = { 0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xF1, 0x5E, 0xE0, 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x4A, 0x70, 0x4B, 0xAD, 0x2E, 0x9C, 0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x96, 0xF3, 0xDC, 0x4E, 0x35, 0xC2, 0x50, 0x4F, 0x74, 0xDB, 0x60, -0x50, 0x64, 0xBE, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, +0x50, 0x5B, 0x91, 0xE0, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x01, 0x02, @@ -8142,7 +8142,7 @@ const unsigned char timelib_timezone_db_data_builtin[258208] = { 0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xF1, 0x5E, 0xE0, 0x48, 0xBB, 0x06, 0x50, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x4A, 0x70, 0x4B, 0xAD, 0x2E, 0x9C, 0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x95, 0xA2, 0x5C, 0x4E, 0x35, 0xC2, 0x50, 0x4E, 0x5C, 0x0B, 0xE0, -0x4E, 0x85, 0x06, 0x80, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x64, 0xE8, 0x80, 0x00, 0x01, 0x00, 0x01, +0x4E, 0x85, 0x06, 0x80, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x5B, 0x91, 0xE0, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, @@ -16559,14 +16559,30 @@ const unsigned char timelib_timezone_db_data_builtin[258208] = { /* Pacific/Apia */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x57, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x12, 0x91, 0x05, 0xFC, 0x00, +0x00, 0x00, 0x00, 0x3A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x12, 0x91, 0x05, 0xFC, 0x00, 0xDA, 0x62, 0x04, 0x38, 0x4C, 0x9F, 0x27, 0xB0, 0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, -0x4E, 0xFD, 0x8B, 0xA0, 0x4F, 0x77, 0x0D, 0xE0, 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0xFF, -0xFF, 0x5F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x5E, 0x48, 0x00, 0x04, 0xFF, 0xFF, 0x65, 0x50, 0x00, -0x09, 0xFF, 0xFF, 0x73, 0x60, 0x01, 0x0D, 0x00, 0x00, 0xC4, 0xE0, 0x01, 0x0D, 0x00, 0x00, 0xB6, -0xD0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x41, 0x4D, 0x54, 0x00, 0x57, 0x53, 0x54, 0x00, -0x57, 0x53, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -0x00, 0x00, 0x74, 0x38, 0x9A, 0x00, 0x0C, 0x9D, 0x2A, 0x00, 0x00, 0x00, 0x00, +0x4E, 0xFD, 0x8B, 0xA0, 0x4F, 0x77, 0x0D, 0xE0, 0x50, 0x66, 0xFE, 0xE0, 0x51, 0x60, 0x2A, 0x60, +0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 0x54, 0x26, 0xC2, 0xE0, 0x55, 0x1F, 0xEE, 0x60, +0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 0x57, 0xE6, 0x86, 0xE0, 0x58, 0xDF, 0xB2, 0x60, +0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 0x5B, 0xAF, 0x85, 0x60, 0x5C, 0xA8, 0xB0, 0xE0, +0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 0x5F, 0x6F, 0x49, 0x60, 0x60, 0x68, 0x74, 0xE0, +0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 0x63, 0x2F, 0x0D, 0x60, 0x64, 0x28, 0x38, 0xE0, +0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 0x66, 0xF8, 0x0B, 0xE0, 0x67, 0xF1, 0x37, 0x60, +0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 0x6A, 0xB7, 0xCF, 0xE0, 0x6B, 0xB0, 0xFB, 0x60, +0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 0x6E, 0x77, 0x93, 0xE0, 0x6F, 0x70, 0xBF, 0x60, +0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 0x72, 0x40, 0x92, 0x60, 0x73, 0x39, 0xBD, 0xE0, +0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 0x76, 0x00, 0x56, 0x60, 0x76, 0xF9, 0x81, 0xE0, +0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 0x79, 0xC0, 0x1A, 0x60, 0x7A, 0xB9, 0x45, 0xE0, +0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 0x7D, 0x89, 0x18, 0xE0, 0x7E, 0x82, 0x44, 0x60, +0x7F, 0x68, 0xFA, 0xE0, 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, +0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, +0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, +0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0xFF, 0xFF, +0x5F, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x5E, 0x48, 0x00, 0x04, 0xFF, 0xFF, 0x65, 0x50, 0x00, 0x09, +0xFF, 0xFF, 0x73, 0x60, 0x01, 0x0D, 0x00, 0x00, 0xC4, 0xE0, 0x01, 0x0D, 0x00, 0x00, 0xB6, 0xD0, +0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x41, 0x4D, 0x54, 0x00, 0x57, 0x53, 0x54, 0x00, 0x57, +0x53, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x74, 0x38, 0x9A, 0x00, 0x0C, 0x9D, 0x2A, 0x00, 0x00, 0x00, 0x00, /* Pacific/Auckland */ 0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -18191,4 +18207,4 @@ const unsigned char timelib_timezone_db_data_builtin[258208] = { 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, }; -const timelib_tzdb timezonedb_builtin = { "2012.6", 576, timezonedb_idx_builtin, timelib_timezone_db_data_builtin }; +const timelib_tzdb timezonedb_builtin = { "2012.7", 576, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };