From 8f3aa89d512d672096e0d8224e1cd4b7427d1afb Mon Sep 17 00:00:00 2001
From: PeiYong Zhang <peiyongz@apache.org>
Date: Tue, 16 Jul 2002 15:19:42 +0000
Subject: [PATCH] check lenght of getEncoding()/getActualEncoding()
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@174014 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/dom/impl/DOMWriterImpl.cpp | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/xercesc/dom/impl/DOMWriterImpl.cpp b/src/xercesc/dom/impl/DOMWriterImpl.cpp
index f38947bbe..6178d9714 100644
--- a/src/xercesc/dom/impl/DOMWriterImpl.cpp
+++ b/src/xercesc/dom/impl/DOMWriterImpl.cpp
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.13 2002/07/16 15:19:42 peiyongz
+ * check lenght of getEncoding()/getActualEncoding()
+ *
* Revision 1.12 2002/06/25 16:17:16 tng
* DOM L3: add release()
*
@@ -602,13 +605,20 @@ void DOMWriterImpl::initSession(const DOMNode* const nodeToWrite)
(DOMDocument*)nodeToWrite : nodeToWrite->getOwnerDocument();
if (docu)
{
- if (docu->getEncoding())
+ const XMLCh* tmpEncoding = docu->getEncoding();
+
+ if ( tmpEncoding && XMLString::stringLen(tmpEncoding))
{
- fEncodingUsed = docu->getEncoding();
+ fEncodingUsed = tmpEncoding;
}
- else if (docu->getActualEncoding())
+ else
{
- fEncodingUsed = docu->getActualEncoding();
+ tmpEncoding = docu->getActualEncoding();
+
+ if ( tmpEncoding && XMLString::stringLen(tmpEncoding))
+ {
+ fEncodingUsed = tmpEncoding;
+ }
}
}
}
--
GitLab