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.5.0alpha1~1021
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31d213930dec5015f8f7a2d37f281d5217c4f051;p=php

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

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;