Fix formatting when writing " as a character.

n8wb · Jan 10, 2016 · 36fd93a · 36fd93a
1 parent 97d56c3
commit 36fd93a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/emitterutils.cpp b/src/emitterutils.cpp
@@ -375,14 +375,16 @@ bool WriteLiteralString(ostream_wrapper& out, const std::string& str,
 bool WriteChar(ostream_wrapper& out, char ch) {
   if (('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z')) {
     out << ch;
-  } else if ((0x20 <= ch && ch <= 0x7e) || ch == ' ') {
-    out << "\"" << ch << "\"";
+  } else if (ch == '\"') {
+    out << "\"\\\"\"";
   } else if (ch == '\t') {
     out << "\"\\t\"";
   } else if (ch == '\n') {
     out << "\"\\n\"";
   } else if (ch == '\b') {
     out << "\"\\b\"";
+  } else if ((0x20 <= ch && ch <= 0x7e) || ch == ' ') {
+    out << "\"" << ch << "\"";
   } else {
     out << "\"";
     WriteDoubleQuoteEscapeSequence(out, ch);

diff --git a/test/integration/emitter_test.cpp b/test/integration/emitter_test.cpp
@@ -962,6 +962,14 @@ TEST_F(EmitterTest, QuoteNull) {
   ExpectEmit("\"null\"");
 }
 
+TEST_F(EmitterTest, ValueOfDoubleQuote) {
+  out << YAML::BeginMap;
+  out << YAML::Key << "foo" << YAML::Value << '"';
+  out << YAML::EndMap;
+
+  ExpectEmit("foo: \"\\\"\"");
+}
+
 class EmitterErrorTest : public ::testing::Test {
  protected:
   void ExpectEmitError(const std::string& expectedError) {