From 0b4939645c1f20d564dfa78298fcabb017480134 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Sat, 19 Feb 2022 19:51:41 +0100
Subject: [PATCH] lib: Leverage memcpy (and xcslen)

---
 expat/lib/xmlparse.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 5efa8f63..cc7b47fd 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -8010,12 +8010,9 @@ build_model(XML_Parser parser) {
       const XML_Char *src;
       dest->name = str;
       src = dtd->scaffold[src_node].name;
-      for (;;) {
-        *str++ = *src;
-        if (! *src)
-          break;
-        src++;
-      }
+      const size_t nameLen = xcslen(src) + /* null terminator*/ 1;
+      memcpy(str, src, nameLen * sizeof(XML_Char));
+      str += nameLen;
       dest->numchildren = 0;
       dest->children = NULL;
     } else {