From d88d71e3100c0d9687715e4ffa05a72f4599065c Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 23 Mar 2019 17:35:04 -0400 Subject: [PATCH] Revert strlen -> strnlen optimization pre-v11. We don't have a src/port substitute for that function in older branches, so it fails on platforms lacking the function natively. Per buildfarm. --- src/backend/utils/adt/xml.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 102c1d983a..f8f271c626 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -1213,15 +1213,8 @@ parse_xml_decl(const xmlChar *str, size_t *lenp, if (xmlStrncmp(p, (xmlChar *) " - * rather than an XMLDecl, so we have done what we came to do and found no - * XMLDecl. - * - * We need an input length value for xmlGetUTF8Char, but there's no need - * to count the whole document size, so use strnlen not strlen. - */ - utf8len = strnlen((const char *) (p + 5), MAX_MULTIBYTE_CHAR_LEN); + /* if next char is name char, it's a PI like */ + utf8len = strlen((const char *) (p + 5)); utf8char = xmlGetUTF8Char(p + 5, &utf8len); if (PG_XMLISNAMECHAR(utf8char)) goto finished; -- 2.40.0