From 1256dce1c2c928e1436a7e8bd8b40113099383c8 Mon Sep 17 00:00:00 2001 From: Nick Wellnhofer Date: Tue, 27 May 2025 12:53:17 +0200 Subject: [PATCH] tree: Fix integer overflow in xmlBuildQName This issue affects memory safety and might receive a CVE ID later. Fixes #926. --- tree.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tree.c b/tree.c index 86afb7d6..3b0d0397 100644 --- a/tree.c +++ b/tree.c @@ -20,6 +20,7 @@ #include /* for memset() only ! */ #include +#include #include #ifdef HAVE_CTYPE_H #include @@ -222,16 +223,18 @@ xmlGetParameterEntityFromDtd(const xmlDtd *dtd, const xmlChar *name) { xmlChar * xmlBuildQName(const xmlChar *ncname, const xmlChar *prefix, xmlChar *memory, int len) { - int lenn, lenp; + size_t lenn, lenp; xmlChar *ret; - if (ncname == NULL) return(NULL); + if ((ncname == NULL) || (len < 0)) return(NULL); if (prefix == NULL) return((xmlChar *) ncname); lenn = strlen((char *) ncname); lenp = strlen((char *) prefix); + if (lenn >= SIZE_MAX - lenp - 1) + return(NULL); - if ((memory == NULL) || (len < lenn + lenp + 2)) { + if ((memory == NULL) || ((size_t) len < lenn + lenp + 2)) { ret = (xmlChar *) xmlMallocAtomic(lenn + lenp + 2); if (ret == NULL) { xmlTreeErrMemory("building QName"); -- 2.49.0