svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/dns_win32.c trunk/ext/standard/dns_win32.c

pajoye Thu, 17 Jun 2010 09:26:29 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300510 Log: - Fix bug #52101, dns_get_record()garbage in 'ipv6' field Bug: http://bugs.php.net/52101 (error getting bug information) Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c U php/php-src/trunk/ext/standard/dns_win32.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-06-17 09:11:26 UTC (rev 300509) +++ php/php-src/branches/PHP_5_3/NEWS 2010-06-17 09:26:29 UTC (rev 300510) @@ -74,6 +74,8 @@ requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) +- Fixed bug #52101 (dns_get_record() garbage in 'ipv6' field on Windows). + (Pierre) - Fixed bug #52082 (character_set_client & character_set_connection reset after mysqli_change_user()). (Andrey) - Fixed bug #52043 (GD doesn't recognize latest libJPEG versions). Modified: php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2010-06-17 09:11:26 UTC (rev 300509) +++ php/php-src/branches/PHP_5_3/ext/standard/dns_win32.c 2010-06-17 09:26:29 UTC (rev 300510) @@ -274,6 +274,12 @@ } } + if (have_v6_break && in_v6_break) { + tp[0] = ':'; + tp++; + } + tp[0] = '\0'; + add_assoc_string(*subarray, "type", "AAAA", 1); add_assoc_string(*subarray, "ipv6", buf, 1); } Modified: php/php-src/trunk/ext/standard/dns_win32.c =================================================================== --- php/php-src/trunk/ext/standard/dns_win32.c 2010-06-17 09:11:26 UTC (rev 300509) +++ php/php-src/trunk/ext/standard/dns_win32.c 2010-06-17 09:26:29 UTC (rev 300510) @@ -276,6 +276,12 @@ } } + if (have_v6_break && in_v6_break) { + tp[0] = ':'; + tp++; + } + tp[0] = '\0'; + add_assoc_string(*subarray, "type", "AAAA", 1); add_assoc_string(*subarray, "ipv6", buf, 1); }