Feedback-ID: i0fe9450f:Fastmail
Date: Wed, 17 Jan 2024 08:59:26 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Dmitry Koval <d.koval@postgrespro.ru>
Cc: pgsql-bugs@lists.postgresql.org
Subject: Re: BUG #18274: Error 'invalid XML content'
Message-ID: <ZacYXgM9A_CSLpD8@paquier.xyz>
References: <18274-98d16bc03520665f@postgresql.org>
 <1616257.1704651529@sss.pgh.pa.us>
 <5588db01-45be-48ff-b158-85f789bc502c@postgrespro.ru>
 <1314313.1705259848@sss.pgh.pa.us>
 <0eea123f-388a-41ea-9df3-d4606cf9ed8d@postgrespro.ru>
 <ZaRvbaQ8V9uGxXGD@paquier.xyz>
 <35ef78f9-8958-4225-ae7e-aead71b0feed@postgrespro.ru>
 <ZaZI4WAHZ67ZHq7p@paquier.xyz>
 <24e7412a-890c-46e3-b17d-addc39ff813f@postgrespro.ru>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="DCoGp3bdynbGrWpD"
Content-Disposition: inline
In-Reply-To: <24e7412a-890c-46e3-b17d-addc39ff813f@postgrespro.ru>
Archived-At: 
 <https://www.postgresql.org/message-id/ZacYXgM9A_CSLpD8%40paquier.xyz>
Precedence: bulk


--DCoGp3bdynbGrWpD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Jan 16, 2024 at 04:55:34PM +0300, Dmitry Koval wrote:
>> - Document in a comment why a fake root node is necessary (aka the
>>  current routines don't give enough control over the limits you'd
>> like to enforce).
>=20
> Comment expanded (see src/backend/utils/adt/xml.c).
>=20
>> - The top comment of xml_parse() still mentions
>> xmlParseBalancedChunkMemory() as an effect of 483bdb2afec9, so this
>> needs to be updated.
>=20
> Updated.

I still need to evaluate a bit more this part, though that looks fine.

>> Also, it may be worth double-checking if there are other things marked
>> as deprecated in the upstream doc, and switch to "newer" things.
>=20
> I found another deprecated function xmlSubstituteEntitiesDefault [1]
> (contrib/xml2). xmlSubstituteEntitiesDefault was removed and added the
> XML_PARSE_NOENT flag in functions xmlReadMemory instead it.

This one had better be done first because it is required by your
original issue, and that's what could make the buildfarm shaky.

I have checked the other XML calls in the tree and did not spot
anything else that ought to be changed, so I have extracted this stuff
=66rom your v2 and applied it on HEAD.  Let's see how it goes.
--
Michael

--DCoGp3bdynbGrWpD
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmWnGF4ACgkQnvQgOdby
QH3QThAAhZXd7bJ4h1Q4k/2ShVWOSxt/QWCVTTnaWGjwmXxEviS9vHZUIo8rVArL
Eac/5Sy96tH/6CLI3Mjf6zu3+MzB5A9pWMm159+UaKhyqitrPeuP5/5PuBb0etQu
sqrogGu2ct9Ni0UGhZ1e+cxOrVldxMHhI2VkHhYL0q/I9u6D0fgLaWwsylAV52YT
/E3suGRvs2s4A1+XyvLLaT5IEabfVTfffmM30JirJb0ddHPX18HGOQ55evSMQCXr
HYFqqz/KhDMOzYn8qTtx1udlSTQZz+cZrenjMYtwVjLh137hlHBqR9WDjX/WsIpS
Vf7Cvf6xlY/5o5sIxNJ84bNW9a72ssAEGMus/BVZ2wpU2J9A/db4YpA9l1iYfrs8
Tujmf0LnDjUbSX7aZqQIg03OypldfDBVyzTaSgJAMVUTH0ETMC1PMh3qgcKrWJsE
gswBVIViUMmSmt84MSMQE64vY75T3Iax+LbEJl91X7f2fOxeARjwgpG+fZOV5WxI
Ofhq2c0wLtL1na43vyvv5YvJCq9K8gsqJC1UKgr2D+VPk6y7Gtcy3F7PBf3b5aGv
Av1F1lWimNkXYKB43JyejglIq00/H0fUYLc3CcvqY8VhL8UWUubP9QcO20A1QPl9
DeXr+0bHTxPpolQJfkxxigMyndC5BvljWgu4d/IuUGjHE4uFsz4=
=9eAi
-----END PGP SIGNATURE-----

--DCoGp3bdynbGrWpD--