- Fixed bug #60033 (Incorrectly merged PDO dblib patches break uniqueidentifier colum...

diff --git a/NEWS b/NEWS
index 3de5badcaf3bd7f65015fceb83fab1a6f84169c5..032a40f977ab1aa64a76cee9400ce0ac48371cc5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 c7c48f59163bb69d1d2f4679e8168a1b666f9b07..8fa8dd7b672a89ee01b90ba70e5a060968fc0e7e 100644 (file)
--- 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;