diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-03-23 17:35:05 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-03-23 17:35:05 -0400 |
commit | 809cccc3547462cd6b9a110ac82a5a60b9ee8587 (patch) | |
tree | 5460cb527f463a0b321a242eda9acf185e2b133b /src/backend/utils/adt/xml.c | |
parent | 08d8cfe3cfd69bff1729ba0cc2726e37b9c6eecf (diff) | |
download | postgresql-809cccc3547462cd6b9a110ac82a5a60b9ee8587.tar.gz postgresql-809cccc3547462cd6b9a110ac82a5a60b9ee8587.zip |
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.
Diffstat (limited to 'src/backend/utils/adt/xml.c')
-rw-r--r-- | src/backend/utils/adt/xml.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index e7d1e45a9d3..5b4fd4d4f8e 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -1155,15 +1155,8 @@ parse_xml_decl(const xmlChar *str, size_t *lenp, if (xmlStrncmp(p, (xmlChar *) "<?xml", 5) != 0) goto finished; - /* - * If next char is a name char, it's a PI like <?xml-stylesheet ...?> - * 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 <?xml-stylesheet ...?> */ + utf8len = strlen((const char *) (p + 5)); utf8char = xmlGetUTF8Char(p + 5, &utf8len); if (PG_XMLISNAMECHAR(utf8char)) goto finished; |