felipe                                   Wed, 12 Oct 2011 01:24:51 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=318042

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

Bug: https://bugs.php.net/60033 (Open) Incorrectly merged PDO dblib patches 
break uniqueidentifier column type
      
Changed paths:
    U   php/php-src/branches/PHP_5_4/NEWS
    U   php/php-src/branches/PHP_5_4/ext/pdo_dblib/dblib_stmt.c
    U   php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c

Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS   2011-10-12 01:16:11 UTC (rev 318041)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-10-12 01:24:51 UTC (rev 318042)
@@ -3,6 +3,7 @@
 ?? ??? 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 @@
 - 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).

Modified: php/php-src/branches/PHP_5_4/ext/pdo_dblib/dblib_stmt.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_dblib/dblib_stmt.c     2011-10-12 
01:16:11 UTC (rev 318041)
+++ php/php-src/branches/PHP_5_4/ext/pdo_dblib/dblib_stmt.c     2011-10-12 
01:24:51 UTC (rev 318042)
@@ -235,9 +235,9 @@

                        /* 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;

Modified: php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c
===================================================================
--- php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c        2011-10-12 01:16:11 UTC 
(rev 318041)
+++ php/php-src/trunk/ext/pdo_dblib/dblib_stmt.c        2011-10-12 01:24:51 UTC 
(rev 318042)
@@ -235,9 +235,9 @@

                        /* 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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to