felipe                                   Tue, 20 Apr 2010 11:49:23 +0000

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

Log:
- Fixed bug #51608 (pg_copy_to: WARNING: nonstandard use of \\ in a string 
literal)
Patch by: cbandy at jbandy dot com

Bug: http://bugs.php.net/51608 (Open) pg_copy_to: WARNING: nonstandard use of 
\\ in a string literal
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/pgsql/pgsql.c
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
    U   php/php-src/trunk/ext/pgsql/pgsql.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2010-04-20 11:32:30 UTC (rev 298209)
+++ php/php-src/branches/PHP_5_2/NEWS   2010-04-20 11:49:23 UTC (rev 298210)
@@ -12,6 +12,8 @@
 - Fixed a NULL pointer dereference when processing invalid XML-RPC
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)

+- Fixed bug #51608 (pg_copy_to: WARNING: nonstandard use of \\ in a string
+  literal). (cbandy at jbandy dot com)
 - Fixed bug #51445 (var_dump() invalid/slow *RECURSION* detection). (Felipe)
 - Fixed bug #51393 (DateTime::createFromFormat() fails if format string 
contains
   timezone). (Adam)

Modified: php/php-src/branches/PHP_5_2/ext/pgsql/pgsql.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pgsql/pgsql.c      2010-04-20 11:32:30 UTC 
(rev 298209)
+++ php/php-src/branches/PHP_5_2/ext/pgsql/pgsql.c      2010-04-20 11:49:23 UTC 
(rev 298210)
@@ -3342,9 +3342,9 @@
        }

        if (memchr(table_name, '.', table_name_len)) {
-               spprintf(&query, 0, "COPY %s TO STDOUT DELIMITERS '%c' WITH 
NULL AS '%s'", table_name, *pg_delim, pg_null_as);
+               spprintf(&query, 0, "COPY %s TO STDOUT DELIMITERS E'%c' WITH 
NULL AS E'%s'", table_name, *pg_delim, pg_null_as);
        } else {
-               spprintf(&query, 0, "COPY \"%s\" TO STDOUT DELIMITERS '%c' WITH 
NULL AS '%s'", table_name, *pg_delim, pg_null_as);
+               spprintf(&query, 0, "COPY \"%s\" TO STDOUT DELIMITERS E'%c' 
WITH NULL AS E'%s'", table_name, *pg_delim, pg_null_as);
        }

        while ((pgsql_result = PQgetResult(pgsql))) {

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-04-20 11:32:30 UTC (rev 298209)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-04-20 11:49:23 UTC (rev 298210)
@@ -18,6 +18,8 @@
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)

+- Fixed bug #51608 (pg_copy_to: WARNING: nonstandard use of \\ in a string
+  literal). (cbandy at jbandy dot com)
 - Fixed bug #51590 (JSON_ERROR_UTF8 is undefined). (Felipe)
 - Fixed bug #51577 (Uninitialized memory reference with oci_bind_array_by_name)
   (Oracle Corp.)

Modified: php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c      2010-04-20 11:32:30 UTC 
(rev 298209)
+++ php/php-src/branches/PHP_5_3/ext/pgsql/pgsql.c      2010-04-20 11:49:23 UTC 
(rev 298210)
@@ -3765,9 +3765,9 @@
        }

        if (memchr(table_name, '.', table_name_len)) {
-               spprintf(&query, 0, "COPY %s TO STDOUT DELIMITERS '%c' WITH 
NULL AS '%s'", table_name, *pg_delim, pg_null_as);
+               spprintf(&query, 0, "COPY %s TO STDOUT DELIMITERS E'%c' WITH 
NULL AS E'%s'", table_name, *pg_delim, pg_null_as);
        } else {
-               spprintf(&query, 0, "COPY \"%s\" TO STDOUT DELIMITERS '%c' WITH 
NULL AS '%s'", table_name, *pg_delim, pg_null_as);
+               spprintf(&query, 0, "COPY \"%s\" TO STDOUT DELIMITERS E'%c' 
WITH NULL AS E'%s'", table_name, *pg_delim, pg_null_as);
        }

        while ((pgsql_result = PQgetResult(pgsql))) {

Modified: php/php-src/trunk/ext/pgsql/pgsql.c
===================================================================
--- php/php-src/trunk/ext/pgsql/pgsql.c 2010-04-20 11:32:30 UTC (rev 298209)
+++ php/php-src/trunk/ext/pgsql/pgsql.c 2010-04-20 11:49:23 UTC (rev 298210)
@@ -3765,9 +3765,9 @@
        }

        if (memchr(table_name, '.', table_name_len)) {
-               spprintf(&query, 0, "COPY %s TO STDOUT DELIMITERS '%c' WITH 
NULL AS '%s'", table_name, *pg_delim, pg_null_as);
+               spprintf(&query, 0, "COPY %s TO STDOUT DELIMITERS E'%c' WITH 
NULL AS E'%s'", table_name, *pg_delim, pg_null_as);
        } else {
-               spprintf(&query, 0, "COPY \"%s\" TO STDOUT DELIMITERS '%c' WITH 
NULL AS '%s'", table_name, *pg_delim, pg_null_as);
+               spprintf(&query, 0, "COPY \"%s\" TO STDOUT DELIMITERS E'%c' 
WITH NULL AS E'%s'", table_name, *pg_delim, pg_null_as);
        }

        while ((pgsql_result = PQgetResult(pgsql))) {

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

Reply via email to