Tom Lane wrote:
Andrew Dunstan <[EMAIL PROTECTED]> writes:
Tom Lane wrote:
I think at minimum we need to forbid b, f, n, r, t, v, which are the
control character representations currently recognized by COPY.
But I'm tempted to make it reject all 26 lower-case ASCII letters,
as a form of future-proofing.  Thoughts?

Assuming this is only for non-CSV mode, it seems OK.

On looking closer, 'x', octal digits, and '.' would also be trouble.
So I made it reject a-z, 0-9, and dot.

It appears that the CSV mode is a few bricks shy of a load here as
well: it will let you do CSV DELIMITER '"' resulting in entirely
broken output.  It seems we ought to forbid delimiter from matching CSV
quote or escape characters.  I'll let you clean up that case though...

This should do the trick - I'll apply it tomorrow.



Index: copy.c
RCS file: /cvsroot/pgsql/src/backend/commands/copy.c,v
retrieving revision 1.293
diff -c -r1.293 copy.c
*** copy.c      27 Dec 2007 18:28:58 -0000      1.293
--- copy.c      28 Dec 2007 04:07:06 -0000
*** 889,894 ****
--- 889,907 ----
errmsg("COPY delimiter cannot be \"%s\"", cstate->delim)));

+       /* In CSV mode, disallow quote or escape chars as delimiter */
+       if (cstate->csv_mode)
+       {
+               if (cstate->delim[0] == cstate->quote[0])
+                       ereport(ERROR,
+ (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("COPY delimiter and quote must be different")));
+               else if (cstate->delim[0] == cstate->escape[0])
+                       ereport(ERROR,
+ (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("COPY delimiter and escape must be different")));
+       }
       /* Check header */
       if (!cstate->csv_mode && cstate->header_line)

---------------------------(end of broadcast)---------------------------
TIP 7: You can help support the PostgreSQL project by donating at


Reply via email to