Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src: Fixed bug #63236 (Executable permission on various source files) Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
2024-09-25 11:57:26 +00:00 · 2012-10-08 22:51:58 -07:00 · 2012-10-08 22:51:58 -07:00 · bef8ff4c7b
commit bef8ff4c7b
parent 91169fb24f e4a8fa6a15
67 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -57,6 +57,10 @@ PHP                                                                        NEWS
  . Implemented FR #61421 (OpenSSL signature verification missing RMD160, 
    SHA224, SHA256, SHA384, SHA512). (Mark Jones)

+- PDO:
+  . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).
+    (Martin Osvald, Remi)
+
 - SOAP
  . Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
    (Dmitry)
--- a/Zend/zend_build.h
+++ b/Zend/zend_build.h
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
--- a/Zend/zend_interfaces.h
+++ b/Zend/zend_interfaces.h
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
--- a/Zend/zend_iterators.h
+++ b/Zend/zend_iterators.h
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
--- a/ext/dba/dba_db1.c
+++ b/ext/dba/dba_db1.c
--- a/ext/dba/dba_qdbm.c
+++ b/ext/dba/dba_qdbm.c
--- a/ext/dba/php_db1.h
+++ b/ext/dba/php_db1.h
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
--- a/ext/interbase/php_ibase_includes.h
+++ b/ext/interbase/php_ibase_includes.h
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.c
--- a/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
+++ b/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
--- a/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
+++ b/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
--- a/ext/mbstring/oniguruma/enc/utf16_be.c
+++ b/ext/mbstring/oniguruma/enc/utf16_be.c
--- a/ext/mbstring/oniguruma/enc/utf16_le.c
+++ b/ext/mbstring/oniguruma/enc/utf16_le.c
--- a/ext/mbstring/oniguruma/enc/utf32_be.c
+++ b/ext/mbstring/oniguruma/enc/utf32_be.c
--- a/ext/mbstring/oniguruma/enc/utf32_le.c
+++ b/ext/mbstring/oniguruma/enc/utf32_le.c
--- a/ext/mbstring/oniguruma/regext.c
+++ b/ext/mbstring/oniguruma/regext.c
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
--- a/ext/pdo/php_pdo.h
+++ b/ext/pdo/php_pdo.h
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
--- a/ext/pdo/php_pdo_int.h
+++ b/ext/pdo/php_pdo_int.h
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
--- a/ext/pdo_mysql/php_pdo_mysql.h
+++ b/ext/pdo_mysql/php_pdo_mysql.h
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
--- a/ext/pdo_oci/oci_statement.c
+++ b/ext/pdo_oci/oci_statement.c
--- a/ext/pdo_oci/pdo_oci.c
+++ b/ext/pdo_oci/pdo_oci.c
--- a/ext/pdo_oci/php_pdo_oci.h
+++ b/ext/pdo_oci/php_pdo_oci.h
--- a/ext/pdo_oci/php_pdo_oci_int.h
+++ b/ext/pdo_oci/php_pdo_oci_int.h
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
@ -114,7 +114,7 @@ void pdo_odbc_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, PDO_ODBC_HSTMT statement,
 	 * diagnostic records (which can be generated by PRINT statements
 	 * in the query, for instance). */
 	while (rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO) {
-		char discard_state[5];
+		char discard_state[6];
 		char discard_buf[1024];
 		SQLINTEGER code;
 		rc = SQLGetDiagRec(htype, eh, recno++, discard_state, &code,
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
--- a/ext/pdo_odbc/php_pdo_odbc_int.h
+++ b/ext/pdo_odbc/php_pdo_odbc_int.h
--- a/ext/simplexml/php_simplexml_exports.h
+++ b/ext/simplexml/php_simplexml_exports.h
--- a/ext/simplexml/sxe.c
+++ b/ext/simplexml/sxe.c
--- a/ext/simplexml/sxe.h
+++ b/ext/simplexml/sxe.h
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
--- a/ext/spl/spl_array.h
+++ b/ext/spl/spl_array.h
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
--- a/ext/spl/spl_directory.h
+++ b/ext/spl/spl_directory.h
--- a/ext/spl/spl_engine.c
+++ b/ext/spl/spl_engine.c
--- a/ext/spl/spl_engine.h
+++ b/ext/spl/spl_engine.h
--- a/ext/spl/spl_exceptions.c
+++ b/ext/spl/spl_exceptions.c
--- a/ext/spl/spl_exceptions.h
+++ b/ext/spl/spl_exceptions.h
--- a/ext/spl/spl_functions.c
+++ b/ext/spl/spl_functions.c
--- a/ext/spl/spl_functions.h
+++ b/ext/spl/spl_functions.h
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
--- a/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
--- a/ext/spl/spl_observer.h
+++ b/ext/spl/spl_observer.h
--- a/ext/standard/winver.h
+++ b/ext/standard/winver.h
--- a/main/php_streams.h
+++ b/main/php_streams.h
--- a/main/streams/glob_wrapper.c
+++ b/main/streams/glob_wrapper.c
--- a/main/streams/php_stream_glob_wrapper.h
+++ b/main/streams/php_stream_glob_wrapper.h
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
--- a/win32/globals.c
+++ b/win32/globals.c
--- a/win32/php_win32_globals.h
+++ b/win32/php_win32_globals.h