summaryrefslogtreecommitdiff
path: root/ext/pdo_dblib/dblib_stmt.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2011-10-12 01:24:51 (GMT)
committerFelipe Pena <felipe@php.net>2011-10-12 01:24:51 (GMT)
commit31d213930dec5015f8f7a2d37f281d5217c4f051 (patch)
treef3e9fa4fe5ea0f783c67721e8294d6514c24c181 /ext/pdo_dblib/dblib_stmt.c
parent261353382f2b38e4dce535c9a2560c2fd80f5171 (diff)
downloadphp-31d213930dec5015f8f7a2d37f281d5217c4f051.tar.gz
- Fixed bug #60033 (Incorrectly merged PDO dblib patches break uniqueidentifier column type)
Diffstat (limited to 'ext/pdo_dblib/dblib_stmt.c')
-rw-r--r--ext/pdo_dblib/dblib_stmt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
index c7c48f5..8fa8dd7 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;