From 427edafce2227fe3b9fb69757bcc41f1dcc33cfc Mon Sep 17 00:00:00 2001
From: Alejandro Martinez <alejandro.martinezvicente@arm.com>
Date: Fri, 24 Mar 2017 13:37:23 +0000
Subject: [PATCH] Changed error code for invalid special ascii chars, fixed
 writer tests

---
 include/rapidjson/reader.h   | 2 +-
 test/unittest/writertest.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/rapidjson/reader.h b/include/rapidjson/reader.h
index 19f8849..b0f7d84 100644
--- a/include/rapidjson/reader.h
+++ b/include/rapidjson/reader.h
@@ -892,7 +892,7 @@ private:
                 if (c == '\0')
                     RAPIDJSON_PARSE_ERROR(kParseErrorStringMissQuotationMark, is.Tell());
                 else
-                    RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, is.Tell());
+                    RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, is.Tell());
             }
             else {
                 size_t offset = is.Tell();
diff --git a/test/unittest/writertest.cpp b/test/unittest/writertest.cpp
index 29f7626..b766dad 100644
--- a/test/unittest/writertest.cpp
+++ b/test/unittest/writertest.cpp
@@ -394,8 +394,10 @@ TEST(Writer, ValidateEncoding) {
         EXPECT_TRUE(writer.String("\xC2\xA2"));         // Cents sign U+00A2
         EXPECT_TRUE(writer.String("\xE2\x82\xAC"));     // Euro sign U+20AC
         EXPECT_TRUE(writer.String("\xF0\x9D\x84\x9E")); // G clef sign U+1D11E
+        EXPECT_TRUE(writer.String("\x01"));             // SOH control U+0001
+        EXPECT_TRUE(writer.String("\x1B"));             // Escape control U+001B
         writer.EndArray();
-        EXPECT_STREQ("[\"\x24\",\"\xC2\xA2\",\"\xE2\x82\xAC\",\"\xF0\x9D\x84\x9E\"]", buffer.GetString());
+        EXPECT_STREQ("[\"\x24\",\"\xC2\xA2\",\"\xE2\x82\xAC\",\"\xF0\x9D\x84\x9E\",\"\\u0001\",\"\\u001B\"]", buffer.GetString());
     }
 
     // Fail in decoding invalid UTF-8 sequence http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
-- 
2.36.1