153aa9179Sopenharmony_ciFrom 5b2d07a72670513e41b481a9d922c983a64027ca Mon Sep 17 00:00:00 2001
253aa9179Sopenharmony_ciFrom: Nick Wellnhofer <wellnhofer@aevum.de>
353aa9179Sopenharmony_ciDate: Sat, 20 Aug 2022 17:00:50 +0200
453aa9179Sopenharmony_ciSubject: [PATCH] Use xmlStrlen in *CtxtReadDoc
553aa9179Sopenharmony_ci
653aa9179Sopenharmony_cixmlStrlen handles buffers larger than INT_MAX more gracefully.
753aa9179Sopenharmony_ci
853aa9179Sopenharmony_ciReference:https://github.com/GNOME/libxml2/commit/5b2d07a72670513e41b481a9d922c983a64027ca
953aa9179Sopenharmony_ciConflict:NA
1053aa9179Sopenharmony_ci---
1153aa9179Sopenharmony_ci HTMLparser.c | 7 ++-----
1253aa9179Sopenharmony_ci parser.c     | 6 ++----
1353aa9179Sopenharmony_ci 2 files changed, 4 insertions(+), 9 deletions(-)
1453aa9179Sopenharmony_ci
1553aa9179Sopenharmony_cidiff --git a/HTMLparser.c b/HTMLparser.c
1653aa9179Sopenharmony_ciindex a4168f3..e0b32fe 100644
1753aa9179Sopenharmony_ci--- a/HTMLparser.c
1853aa9179Sopenharmony_ci+++ b/HTMLparser.c
1953aa9179Sopenharmony_ci@@ -7087,13 +7087,10 @@ htmlDocPtr
2053aa9179Sopenharmony_ci htmlCtxtReadDoc(htmlParserCtxtPtr ctxt, const xmlChar * cur,
2153aa9179Sopenharmony_ci                const char *URL, const char *encoding, int options)
2253aa9179Sopenharmony_ci {
2353aa9179Sopenharmony_ci-    const char *buf;
2453aa9179Sopenharmony_ci-
2553aa9179Sopenharmony_ci     if (cur == NULL)
2653aa9179Sopenharmony_ci         return (NULL);
2753aa9179Sopenharmony_ci-    buf = (const char *) cur;
2853aa9179Sopenharmony_ci-    return (htmlCtxtReadMemory(ctxt, buf, strlen(buf), URL, encoding,
2953aa9179Sopenharmony_ci-                               options));
3053aa9179Sopenharmony_ci+    return (htmlCtxtReadMemory(ctxt, (const char *) cur, xmlStrlen(cur), URL,
3153aa9179Sopenharmony_ci+                               encoding, options));
3253aa9179Sopenharmony_ci }
3353aa9179Sopenharmony_ci 
3453aa9179Sopenharmony_ci /**
3553aa9179Sopenharmony_cidiff --git a/parser.c b/parser.c
3653aa9179Sopenharmony_ciindex fbeb7af..23b031d 100644
3753aa9179Sopenharmony_ci--- a/parser.c
3853aa9179Sopenharmony_ci+++ b/parser.c
3953aa9179Sopenharmony_ci@@ -15374,12 +15374,10 @@ xmlDocPtr
4053aa9179Sopenharmony_ci xmlCtxtReadDoc(xmlParserCtxtPtr ctxt, const xmlChar * cur,
4153aa9179Sopenharmony_ci                const char *URL, const char *encoding, int options)
4253aa9179Sopenharmony_ci {
4353aa9179Sopenharmony_ci-    const char *buf;
4453aa9179Sopenharmony_ci-
4553aa9179Sopenharmony_ci     if (cur == NULL)
4653aa9179Sopenharmony_ci         return (NULL);
4753aa9179Sopenharmony_ci-    buf = (const char *) cur;
4853aa9179Sopenharmony_ci-    return (xmlCtxtReadMemory(ctxt, buf, strlen(buf), URL, encoding, options));
4953aa9179Sopenharmony_ci+    return (xmlCtxtReadMemory(ctxt, (const char *) cur, xmlStrlen(cur), URL,
5053aa9179Sopenharmony_ci+                              encoding, options));
5153aa9179Sopenharmony_ci }
5253aa9179Sopenharmony_ci 
5353aa9179Sopenharmony_ci /**
5453aa9179Sopenharmony_ci-- 
5553aa9179Sopenharmony_ci2.27.0
5653aa9179Sopenharmony_ci
57