Merge pull request #840 from dota17/master

skip comment node before get text
2020-12-30 10:18:16 -08:00
parent 8e1af3a7f9 d59fd15db6
commit 11376382fa
1 changed files with 12 additions and 2 deletions
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1655,8 +1655,18 @@ float XMLElement::FloatAttribute(const char* name, float defaultValue) const

 const char* XMLElement::GetText() const
 {
-    if ( FirstChild() && FirstChild()->ToText() ) {
-        return FirstChild()->Value();
+    /* skip comment node */
+    const XMLNode* node = FirstChild();
+    while (node) {
+        if (node->ToComment()) {
+            node = node->NextSibling();
+            continue;
+        }
+        break;
+    }
+
+    if ( node && node->ToText() ) {
+        return node->Value();
    }
    return 0;
 }