add length parameter to addText, to match attr values

src/xml/SkXMLWriter.cpp

-
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-
 #include "SkXMLWriter.h"
 #include "SkStream.h"
 
 SkXMLWriter::SkXMLWriter(bool doEscapeMarkup) : fDoEscapeMarkup(doEscapeMarkup)
 {
 }
 
 SkXMLWriter::~SkXMLWriter()
 {
     SkASSERT(fElems.count() == 0);
@@ skipping 24 matching lines @@
     this->addAttribute(name, tmp.c_str());
 }
 
 void SkXMLWriter::addScalarAttribute(const char name[], SkScalar value)
 {
     SkString    tmp;
     tmp.appendScalar(value);
     this->addAttribute(name, tmp.c_str());
 }
 
-void SkXMLWriter::addText(const char text[])
-{
+void SkXMLWriter::addText(const char text[], size_t length) {
     if (fElems.isEmpty()) {
         return;
     }
+    
+    this->onAddText(text, length);
+    
+    fElems.top()->fHasText = true;
+}
 
-    this->onAddText(text);
-
-    fElems.top()->fHasText = true;
+void SkXMLWriter::addText(const char cstr[]) {
+    this->addText(cstr, strlen(cstr));
 }
 
 void SkXMLWriter::doEnd(Elem* elem)
 {
     delete elem;
 }
 
 bool SkXMLWriter::doStart(const char name[], size_t length)
 {
     int level = fElems.count();
@@ skipping 149 matching lines @@
 void SkXMLStreamWriter::onAddAttributeLen(const char name[], const char value[], size_t length)
 {
     SkASSERT(!fElems.top()->fHasChildren && !fElems.top()->fHasText);
     fStream.writeText(" ");
     fStream.writeText(name);
     fStream.writeText("=\"");
     fStream.write(value, length);
     fStream.writeText("\"");
 }
 
-void SkXMLStreamWriter::onAddText(const char text[])
-{
+void SkXMLStreamWriter::onAddText(const char text[], size_t length) {
     Elem* elem = fElems.top();
 
     if (!elem->fHasChildren && !elem->fHasText) {
         fStream.writeText(">");
         fStream.newline();
     }
 
     tab(fStream, fElems.count() + 1);
     fStream.writeText(text);

[f(malita), 2015/02/05 02:16:17]

If we're accepting explicit text lengths, we shouldn't ignore them.

[reed1, 2015/02/05 02:17:45]

Yikes, good catch. Will fix.

     fStream.newline();
 }
 
 void SkXMLStreamWriter::onEndElement()
 {
     Elem* elem = getEnd();
     if (elem->fHasChildren || elem->fHasText)
     {
         tab(fStream, fElems.count());
         fStream.writeText("</");
@@ skipping 42 matching lines @@
     this->flush();
 }
 
 void SkXMLParserWriter::onAddAttributeLen(const char name[], const char value[], size_t length)
 {
     SkASSERT(fElems.count() == 0 || (!fElems.top()->fHasChildren && !fElems.top()->fHasText));
     SkString str(value, length);
     fParser.addAttribute(name, str.c_str());
 }
 
-void SkXMLParserWriter::onAddText(const char text[])
-{
-    fParser.text(text, SkToInt(strlen(text)));
+void SkXMLParserWriter::onAddText(const char text[], size_t length) {
+    fParser.text(text, SkToInt(length));
 }
 
 void SkXMLParserWriter::onEndElement()
 {
     Elem* elem = this->getEnd();
     fParser.endElement(elem->fName.c_str());
     this->doEnd(elem);
 }
 
 void SkXMLParserWriter::onStartElementLen(const char name[], size_t length)
@@ skipping 32 matching lines @@
                 w.endElement();
             w.endElement();
             w.startElement("elem2");
             w.endElement();
         w.endElement();
     w.endElement();
 #endif
 }
 
 #endif