diff options
| author | Xinchen Hui <laruence@php.net> | 2012-10-09 13:14:31 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-10-09 13:15:18 +0800 |
| commit | 931571260b28bec7c53e57803e03ee0c38e8595e (patch) | |
| tree | 794dfdfcbd75d80e30c4567af74fdcb1df0f4d09 | |
| parent | 67611c67fa5a3b2c199d41ef7df3307308c56faa (diff) | |
| parent | 45e0d452c5c369f0141fde780a6cbdd35d8f55b4 (diff) | |
| download | php-git-931571260b28bec7c53e57803e03ee0c38e8595e.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
| -rw-r--r-- | NEWS | 4 | ||||
| -rwxr-xr-x | ext/pdo_odbc/odbc_driver.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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) diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c index 84a147b80c..ca2808c6f5 100755 --- 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, |