diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-12-22 09:43:10 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-12-22 09:43:10 -0200 |
| commit | 9f1075bb29a2d27c67c2b74141e59bbfc259ae28 (patch) | |
| tree | 525b9ee833a85428d6c8af2be652963b40c24a67 | |
| parent | 0525dce3c8f38847acf461fc7cd26a036a7a9ee5 (diff) | |
| parent | 8e36d36ee6dc89701416c282ede0bcd92fd3aa0e (diff) | |
| download | php-git-9f1075bb29a2d27c67c2b74141e59bbfc259ae28.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- 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.c | 3 |
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, |