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

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;