From: Sebastian Pipping <sebastian@pipping.org>
Date: Sat, 2 Sep 2017 23:20:52 +0000 (+0200)
Subject: xmlparse.c: Resolve macro "nsAttsVersion" (issue #59)
X-Git-Tag: R_2_2_5~19^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a8f6a0dae3ac23a97629a824324bf53150eb711;p=libexpat

xmlparse.c: Resolve macro "nsAttsVersion" (issue #59)
---

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 7465bf48..4565a190 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -668,7 +668,6 @@ struct XML_ParserStruct {
 #define defaultExpandInternalEntities \
         (parser->m_defaultExpandInternalEntities)
 #define buffer (parser->m_buffer)
-#define nsAttsVersion (parser->m_nsAttsVersion)
 #define nsAttsPower (parser->m_nsAttsPower)
 #define attInfo (parser->m_attInfo)
 #define tempPool (parser->m_tempPool)
@@ -1034,7 +1033,7 @@ parserCreate(const XML_Char *encodingName,
   parser->m_ns_triplets = XML_FALSE;
 
   parser->m_nsAtts = NULL;
-  nsAttsVersion = 0;
+  parser->m_nsAttsVersion = 0;
   nsAttsPower = 0;
 
   parser->m_protocolEncodingName = NULL;
@@ -3320,7 +3319,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
   i = 0;
   if (nPrefixes) {
     int j;  /* hash table index */
-    unsigned long version = nsAttsVersion;
+    unsigned long version = parser->m_nsAttsVersion;
     int nsAttsSize = (int)1 << nsAttsPower;
     unsigned char oldNsAttsPower = nsAttsPower;
     /* size of hash table must be at least 2 * (# of prefixed attributes) */
@@ -3346,7 +3345,7 @@ storeAtts(XML_Parser parser, const ENCODING *enc,
       for (j = nsAttsSize; j != 0; )
         parser->m_nsAtts[--j].version = version;
     }
-    nsAttsVersion = --version;
+    parser->m_nsAttsVersion = --version;
 
     /* expand prefixed names and check for duplicates */
     for (; i < attIndex; i += 2) {