From d807c7ef3f1a04026c3c4b5b24954f7fc84d0e46 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 7 Jan 2007 22:49:56 +0000 Subject: Some fine-tuning of xmlpi in corner cases: - correct error codes - do syntax checks in correct order - strip leading spaces of argument --- src/backend/utils/adt/xml.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/backend/utils/adt/xml.c') diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 597ba4f7137..5137834efb1 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.12 2007/01/07 00:13:55 petere Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.13 2007/01/07 22:49:56 petere Exp $ * *------------------------------------------------------------------------- */ @@ -257,7 +257,7 @@ xmlparse(text *data, bool is_document, bool preserve_whitespace) xmltype * -xmlpi(char *target, text *arg) +xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null) { #ifdef USE_LIBXML xmltype *result; @@ -265,10 +265,18 @@ xmlpi(char *target, text *arg) if (pg_strncasecmp(target, "xml", 3) == 0) ereport(ERROR, - (errcode(ERRCODE_INVALID_XML_PROCESSING_INSTRUCTION), + (errcode(ERRCODE_SYNTAX_ERROR), /* really */ errmsg("invalid XML processing instruction"), errdetail("XML processing instruction target name cannot start with \"xml\"."))); + /* + * Following the SQL standard, the null check comes after the + * syntax check above. + */ + *result_is_null = arg_is_null; + if (*result_is_null) + return NULL; + initStringInfo(&buf); appendStringInfo(&buf, "\"."))); appendStringInfoChar(&buf, ' '); - appendStringInfoString(&buf, string); + appendStringInfoString(&buf, string + strspn(string, " ")); pfree(string); } appendStringInfoString(&buf, "?>"); -- cgit v1.2.3