commit 3fbc97f402a516cfda1cc40c95d3190ce006bceb
author Scott Cantor <scantor@apache.org> Tue Feb 13 00:54:01 2018 +0000
committer Scott Cantor <scantor@apache.org> Tue Feb 13 00:54:01 2018 +0000
tree fcfd11ca61a5d41db842be1193c2bdc082d83f4c
parent 6bb14e184d8d7667d16ac0216116198ff784affb

XERCESC-2130 - UTF16 Surrogate values failing

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@1824086 13f79535-47bb-0310-9956-ffa450edef68

src/xercesc/dom/impl/DOMLSSerializerImpl.cpp

diff --git a/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp b/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
index 72d073f..fc59de0 100644
--- a/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
+++ b/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
@@ -1737,13 +1737,29 @@
 void DOMLSSerializerImpl::ensureValidString(const DOMNode* nodeToWrite, const XMLCh* string)
 {
     // XERCESC-1854: prevent illegal characters from being written
+    // XERCESC-2130: allow surrogates
     if(string==0)
         return;
     const XMLCh* cursor=string;
     while(*cursor!=0)
     {
         if((fIsXml11 && !XMLChar1_1::isXMLChar(*cursor)) || (!fIsXml11 && !XMLChar1_0::isXMLChar(*cursor)))
-            reportError(nodeToWrite, DOMError::DOM_SEVERITY_FATAL_ERROR, XMLDOMMsg::INVALID_CHARACTER_ERR);
+        {
+            if((*cursor >= 0xD800) && (*cursor <= 0xDBFF))
+            {
+                XMLCh leadingSurrogate = *cursor;
+                cursor++;
+                if(0==*cursor || (fIsXml11 && !XMLChar1_1::isXMLChar(leadingSurrogate, *cursor)) || (!fIsXml11 && !XMLChar1_0::isXMLChar(leadingSurrogate, *cursor)))
+                {
+                    reportError(nodeToWrite, DOMError::DOM_SEVERITY_FATAL_ERROR, XMLDOMMsg::INVALID_CHARACTER_ERR);
+                    return; // leave if reportError does not throw
+                }
+            }
+            else
+            {
+                reportError(nodeToWrite, DOMError::DOM_SEVERITY_FATAL_ERROR, XMLDOMMsg::INVALID_CHARACTER_ERR);
+            }
+        }
         cursor++;
     }
 }