From: Felipe Pena <felipe@php.net>
Date: Wed, 12 Oct 2011 01:24:51 +0000 (+0000)
Subject: - Fixed bug #60033 (Incorrectly merged PDO dblib patches break uniqueidentifier colum... 
X-Git-Tag: php-5.4.0beta2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d080277d973e8f59d6ceee6541700f44d979d161;p=php

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

diff --git a/NEWS b/NEWS
index 3de5badcaf..032a40f977 100644
--- 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 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;