mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
- Fixed bug #60033 (Incorrectly merged PDO dblib patches break uniqueidentifier column type)
This commit is contained in:
parent
71eaaf6567
commit
d080277d97
5
NEWS
5
NEWS
@ -4,6 +4,7 @@ PHP NEWS
|
||||
- General improvements:
|
||||
. Improve the warning message of incompatible arguments. (Laruence)
|
||||
|
||||
|
||||
- Core:
|
||||
. Fixed bug #55749 (TOCTOU issue in getenv() on Windows builds). (Pierre)
|
||||
. Fixed bug #55707 (undefined reference to `__sync_fetch_and_add_4' on Linux
|
||||
@ -19,6 +20,10 @@ PHP NEWS
|
||||
- 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).
|
||||
(Ilia, jeffhuang9999 at gmail dot com)
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user