Skip to content

Commit d88d71e

Browse files
committed
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.
1 parent de92252 commit d88d71e

File tree

1 file changed

+2
-9
lines changed
  • src/backend/utils/adt

1 file changed

+2
-9
lines changed

src/backend/utils/adt/xml.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,15 +1213,8 @@ parse_xml_decl(const xmlChar *str, size_t *lenp,
12131213
if (xmlStrncmp(p, (xmlChar *) "<?xml", 5) != 0)
12141214
goto finished;
12151215

1216-
/*
1217-
* If next char is a name char, it's a PI like <?xml-stylesheet ...?>
1218-
* rather than an XMLDecl, so we have done what we came to do and found no
1219-
* XMLDecl.
1220-
*
1221-
* We need an input length value for xmlGetUTF8Char, but there's no need
1222-
* to count the whole document size, so use strnlen not strlen.
1223-
*/
1224-
utf8len = strnlen((const char *) (p + 5), MAX_MULTIBYTE_CHAR_LEN);
1216+
/* if next char is name char, it's a PI like <?xml-stylesheet ...?> */
1217+
utf8len = strlen((const char *) (p + 5));
12251218
utf8char = xmlGetUTF8Char(p + 5, &utf8len);
12261219
if (PG_XMLISNAMECHAR(utf8char))
12271220
goto finished;

0 commit comments

Comments
 (0)