From: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
---|---|
To: | pgsql-committers(at)lists(dot)postgresql(dot)org |
Subject: | pgsql: Clean up dubious error handling in wellformed_xml(). |
Date: | 2022-12-16 16:10:54 |
Message-ID: | E1p6DIT-003uc9-7A@gemulon.postgresql.org |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-committers |
Clean up dubious error handling in wellformed_xml().
This ancient bit of code was summarily trapping any ereport longjmp
whatsoever and assuming that it must represent an invalid-XML report.
It's not really appropriate to handle OOM-like situations that way:
maybe the input is valid or maybe not, but we couldn't find out.
And it'd be a seriously bad idea to ignore, say, a query cancel
error that way. (Perhaps that can't happen because there is no
CHECK_FOR_INTERRUPTS anywhere within xml_parse, but even if that's
true today it's obviously a very fragile assumption.)
But in the wake of the previous commit, we can drop the PG_TRY
here altogether, and use the soft error mechanism to catch only
the kinds of errors that are legitimate to treat as invalid-XML.
(This is our first use of the soft error mechanism for something
not directly related to a datatype input function. It won't be
the last.)
xml_is_document can be converted in the same way. That one is
not actively broken, because it was checking specifically for
ERRCODE_INVALID_XML_DOCUMENT rather than trapping everything;
but the code is still shorter and probably faster this way.
Discussion: https://postgr.es/m/3564577.1671142683@sss.pgh.pa.us
Branch
------
master
Details
-------
https://git.postgresql.org/pg/commitdiff/c4939f121563f300b98b30837151753fc8255554
Modified Files
--------------
src/backend/utils/adt/xml.c | 64 ++++++++++++---------------------------------
1 file changed, 17 insertions(+), 47 deletions(-)
From | Date | Subject | |
---|---|---|---|
Next Message | Bruce Momjian | 2022-12-16 17:16:19 | pgsql: C comment: fix wording |
Previous Message | Andres Freund | 2022-12-16 07:12:59 | Re: pgsql: meson: Add 'running' test setup, as a replacement for installche |