summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2013-12-22 09:42:45 -0200
committerFelipe Pena <felipensp@gmail.com>2013-12-22 09:42:45 -0200
commita05611358606ca21672c49d26c77b7b0c81cab07 (patch)
tree91da8faeb513e9239384dd458903efcff090ce7b
parent97bf25438526a2d4d60d4284bd12c1d40ae7134c (diff)
downloadphp-git-a05611358606ca21672c49d26c77b7b0c81cab07.tar.gz
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
-rw-r--r--ext/pdo_odbc/odbc_stmt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index 89b67210c5..e0d7e62f23 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,