php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-06 15:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).

Browse Source
This commit is contained in:
Ilia Alshanetsky
2012-03-14 20:20:33 +00:00
parent 0fde9acd12
commit 0af900f976
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -75,6 +75,9 @@ PHP NEWS
. Fixed bug #61194 (PDO should export compression flag with myslqnd).
(Johannes)
- PDO_odbc
. Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). (Ilia)
- Phar
. Fixed bug #61184 (Phar::webPhar() generates headers with trailing NUL
bytes). (Nikita Popov)

12
ext/pdo_odbc/odbc_stmt.c
View File

@@ -637,12 +637,14 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned l
if (C->fetched_len != SQL_NO_TOTAL) {
/* use size suggested by the driver, if it knows it */
alloced = C->fetched_len + 1;
buf = emalloc(C->fetched_len + 1);
memcpy(buf, C->data, C->fetched_len);
buf[C->fetched_len] = 0;
used = C->fetched_len;
} else {
buf = estrndup(C->data, 256);
used = 255; /* not 256; the driver NUL terminated the buffer */
}
buf = emalloc(alloced);
memcpy(buf, C->data, 256);
used = 255; /* not 256; the driver NUL terminated the buffer */
do {
C->fetched_len = 0;