com php-src: - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com: ext/pdo_odbc/ odbc_stmt.c
| From: | Felipe Pena | Date: | Sun, 22 Dec 2013 11:42:45 +0000 |
| Subject: | com php-src: - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com: ext/pdo_odbc/ odbc_stmt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75392@lists.php.net to get a copy of this message | ||
Commit: a05611358606ca21672c49d26c77b7b0c81cab07
Author: Felipe Pena <felipensp@gmail.com> Sun, 22 Dec 2013 09:42:45 -0200
Parents: 97bf25438526a2d4d60d4284bd12c1d40ae7134c
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a05611358606ca21672c49d26c77b7b0c81cab07
Log:
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky
dot com
Bugs:
https://bugs.php.net/66311
Changed paths:
M ext/pdo_odbc/odbc_stmt.c
Diff:
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index 89b6721..e0d7e62 100644
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -551,7 +551,8 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
struct pdo_column_data *col = &stmt->columns[colno];
RETCODE rc;
SWORD colnamelen;
- SDWORD colsize, displaysize;
+ SDWORD colsize;
+ SQLLEN displaysize;
rc = SQLDescribeCol(S->stmt, colno+1, S->cols[colno].colname,
sizeof(S->cols[colno].colname)-1, &colnamelen,