clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed bug #60033 (Incorrectly merged PDO dblib patches break uniqueidentifier column type)

Browse Source
This commit is contained in:
Felipe Pena 2011-10-12 01:24:51 +00:00
parent 71eaaf6567
commit d080277d97
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -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).

4
ext/pdo_dblib/dblib_stmt.c
View File

@ -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;