From 1270e5bc0836d296ac4970fc9e1cf53d83972083 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 7 Sep 2025 12:18:08 +0200 Subject: [PATCH] lib: Make XML_MemFree and XML_FreeContentModel match their siblings .. XML_MemMalloc and XML_MemRealloc in structure, prior to upcoming changes CVE: CVE-2025-59375 Upstream-Status: Backport [https://github.com/libexpat/libexpat/commit/1270e5bc0836d296ac4970fc9e1cf53d83972083] Signed-off-by: Peter Marko --- lib/xmlparse.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/xmlparse.c b/lib/xmlparse.c index fcf1cfdd..5d27cd45 100644 --- a/lib/xmlparse.c +++ b/lib/xmlparse.c @@ -2772,8 +2772,9 @@ XML_GetCurrentColumnNumber(XML_Parser parser) { void XMLCALL XML_FreeContentModel(XML_Parser parser, XML_Content *model) { - if (parser != NULL) - FREE(parser, model); + if (parser == NULL) + return; + FREE(parser, model); } void *XMLCALL @@ -2792,8 +2793,9 @@ XML_MemRealloc(XML_Parser parser, void *ptr, size_t size) { void XMLCALL XML_MemFree(XML_Parser parser, void *ptr) { - if (parser != NULL) - FREE(parser, ptr); + if (parser == NULL) + return; + FREE(parser, ptr); } void XMLCALL