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: | Anatol Belski | Date: | Mon, 23 Dec 2013 11:17:15 +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-75421@lists.php.net to get a copy of this message | ||
Commit: aaca4ede153f9cf26277164d14f3499f76d0e69d
Author: Felipe Pena <felipensp@gmail.com> Sun, 22 Dec 2013 09:42:45 -0200
Committer: Anatol Belski <ab@php.net> Mon, 23 Dec 2013 12:17:15 +0100
Parents: 85251eccaf61308f68d2c746afa1f8e598659625
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aaca4ede153f9cf26277164d14f3499f76d0e69d
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 845617d..215af02 100644
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -552,8 +552,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;
- SQLULEN colsize;
- SQLLEN displaysize;
+ SDWORD colsize;
+ SQLLEN displaysize;
rc = SQLDescribeCol(S->stmt, colno+1, S->cols[colno].colname,
sizeof(S->cols[colno].colname)-1, &colnamelen,