diff options
| author | Felipe Pena <felipe@php.net> | 2011-10-12 01:24:51 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-10-12 01:24:51 +0000 |
| commit | d080277d973e8f59d6ceee6541700f44d979d161 (patch) | |
| tree | 421d4100349edb5c3aa5a17918ab4396eefa0aee | |
| parent | 71eaaf65679fc949b798dec1007826162ecdc4d4 (diff) | |
| download | php-git-d080277d973e8f59d6ceee6541700f44d979d161.tar.gz | |
- Fixed bug #60033 (Incorrectly merged PDO dblib patches break uniqueidentifier column type)
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | ext/pdo_dblib/dblib_stmt.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -3,6 +3,7 @@ PHP NEWS ?? ??? 2011, PHP 5.4.0 RC1 - General improvements: . Improve the warning message of incompatible arguments. (Laruence) + - Core: . Fixed bug #55749 (TOCTOU issue in getenv() on Windows builds). (Pierre) @@ -18,6 +19,10 @@ PHP NEWS - Openssl - Revert r313616 (When we have a blocking SSL socket, respect the timeout option, scottmac), breaks ssl support as described in bugs #55283 and #55848 + +- PDO DBlib driver: + . Fixed bug #60033 (Incorrectly merged PDO dblib patches break + uniqueidentifier column type). (warezthebeef at gmail dot com) - Sysvshm . Fixed bug #55750 (memory copy issue in sysvshm extension). diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c index c7c48f5916..8fa8dd7b67 100644 --- a/ext/pdo_dblib/dblib_stmt.c +++ b/ext/pdo_dblib/dblib_stmt.c @@ -235,9 +235,9 @@ static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* uniqueidentifier is a 16-byte binary number, convert to 32 char hex string */ #ifdef SQLUNIQUE - *len = dbconvert(NULL, SQLUNIQUE, ptr, *len, SQLCHAR, tmp_ptr, *len); + *len = dbconvert(NULL, SQLUNIQUE, *ptr, *len, SQLCHAR, tmp_ptr, *len); #else - *len = dbconvert(NULL, 36, ptr, *len, SQLCHAR, tmp_ptr, *len); + *len = dbconvert(NULL, 36, *ptr, *len, SQLCHAR, tmp_ptr, *len); #endif php_strtoupper(tmp_ptr, *len); *ptr = tmp_ptr; |