Commit:    45e0d452c5c369f0141fde780a6cbdd35d8f55b4
Author:    Xinchen Hui <larue...@php.net>         Tue, 9 Oct 2012 13:13:51 +0800
Parents:   5d9fb8ffeb58d51c44f8a4b9f6b2eaabe271ce82
Branches:  PHP-5.3

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=45e0d452c5c369f0141fde780a6cbdd35d8f55b4

Log:
Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)

Bugs:
https://bugs.php.net/63235

Changed paths:
  M  NEWS
  M  ext/pdo_odbc/odbc_driver.c


Diff:
diff --git a/NEWS b/NEWS
index 0417dcb..46c9bf4 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                            
            NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2012, PHP 5.3.19
 
+- PDO:
+  . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).
+    (Martin Osvald, Remi)
+
 ?? ??? 2012, PHP 5.3.18
 
 (NOTE: Add your entries above for 5.3.19, entries for 5.3.18 should only
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index 84a147b..ca2808c 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,


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to