XERCESC-1978

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/branches/xerces-3.1@1662888 13f79535-47bb-0310-9956-ffa450edef68
gngj · Feb 28, 2015 · 8bdfd96 · 8bdfd96
1 parent 26c72fe
commit 8bdfd96
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/xercesc/dom/impl/DOMDocumentImpl.hpp b/src/xercesc/dom/impl/DOMDocumentImpl.hpp
@@ -380,16 +380,16 @@ inline const XMLCh*  DOMDocumentImpl::getPooledString(const XMLCh *in)
   // declared in the struct, so we don't need to add one again to
   // account for the trailing null.
   //
-  XMLSize_t sizeToAllocate = sizeof(DOMStringPoolEntry) + XMLString::stringLen(in)*sizeof(XMLCh);
+  XMLSize_t n = XMLString::stringLen(in);
+  XMLSize_t sizeToAllocate = sizeof(DOMStringPoolEntry) + n*sizeof(XMLCh);
   *pspe = spe = (DOMStringPoolEntry *)allocate(sizeToAllocate);
   spe->fNext = 0;
   XMLString::copyString((XMLCh*)spe->fString, in);
 
   return spe->fString;
 }
 
-inline const XMLCh* DOMDocumentImpl::
-getPooledNString(const XMLCh *in, XMLSize_t n)
+inline const XMLCh* DOMDocumentImpl::getPooledNString(const XMLCh *in, XMLSize_t n)
 {
   if (in == 0)
     return 0;
@@ -401,7 +401,7 @@ getPooledNString(const XMLCh *in, XMLSize_t n)
   pspe = &fNameTable[inHash];
   while (*pspe != 0)
   {
-    if (XMLString::equalsN((*pspe)->fString, in, n))
+    if (XMLString::stringLen((*pspe)->fString) == n && XMLString::equalsN((*pspe)->fString, in, n))
       return (*pspe)->fString;
     pspe = &((*pspe)->fNext);
   }