pajoye Tue, 12 Jul 2011 15:15:17 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313176
Log: - Fixed bug #55187, readlink returns weird characters when false result Bug: https://bugs.php.net/55187 (Open) readlink returns weird characters when false result Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/standard/link_win32.c U php/php-src/branches/PHP_5_4/ext/standard/link_win32.c U php/php-src/trunk/ext/standard/link_win32.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-07-12 11:46:41 UTC (rev 313175) +++ php/php-src/branches/PHP_5_3/NEWS 2011-07-12 15:15:17 UTC (rev 313176) @@ -6,6 +6,8 @@ though the class has none). (Felipe) - Core + . Fixed bug #55187 (readlink returns weird characters when false result). + (Pierre) . Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia) . Fixed bug #54332 (Crash in zend_mm_check_ptr // Heap corruption). (Dmitry) . Fixed bug #54305 (Crash in gc_remove_zval_from_buffer). (Dmitry) @@ -15,6 +17,7 @@ . Fixed bug #52935 (call exit in user_error_handler cause stream relate core). (Gustavo) + - MCrypt . Change E_ERROR to E_WARNING in mcrypt_create_iv when not enough data has been fetched (Windows). (Pierre) Modified: php/php-src/branches/PHP_5_3/ext/standard/link_win32.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/link_win32.c 2011-07-12 11:46:41 UTC (rev 313175) +++ php/php-src/branches/PHP_5_3/ext/standard/link_win32.c 2011-07-12 15:15:17 UTC (rev 313176) @@ -69,6 +69,7 @@ if (php_sys_readlink(link, target, MAXPATHLEN) == -1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "readlink failed to read the symbolic link (%s), error %d)", link, GetLastError()); + RETURN_FALSE; } RETURN_STRING(target, 1); } Modified: php/php-src/branches/PHP_5_4/ext/standard/link_win32.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/link_win32.c 2011-07-12 11:46:41 UTC (rev 313175) +++ php/php-src/branches/PHP_5_4/ext/standard/link_win32.c 2011-07-12 15:15:17 UTC (rev 313176) @@ -76,6 +76,7 @@ if (php_sys_readlink(link, target, MAXPATHLEN) == -1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "readlink failed to read the symbolic link (%s), error %d)", link, GetLastError()); + RETURN_FALSE; } RETURN_STRING(target, 1); } Modified: php/php-src/trunk/ext/standard/link_win32.c =================================================================== --- php/php-src/trunk/ext/standard/link_win32.c 2011-07-12 11:46:41 UTC (rev 313175) +++ php/php-src/trunk/ext/standard/link_win32.c 2011-07-12 15:15:17 UTC (rev 313176) @@ -76,6 +76,7 @@ if (php_sys_readlink(link, target, MAXPATHLEN) == -1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "readlink failed to read the symbolic link (%s), error %d)", link, GetLastError()); + RETURN_FALSE; } RETURN_STRING(target, 1); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
