From 0f9dbe0a9c78b6a8163e47a4b5e1c5df7a3360b9 Mon Sep 17 00:00:00 2001
From: Milo Yip <miloyip@gmail.com>
Date: Mon, 29 Aug 2016 10:17:57 +0800
Subject: [PATCH 1/2] Defer thread creation in parsebypart example

---
 example/parsebyparts/parsebyparts.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/example/parsebyparts/parsebyparts.cpp b/example/parsebyparts/parsebyparts.cpp
index 57eed005d..a377efd4e 100644
--- a/example/parsebyparts/parsebyparts.cpp
+++ b/example/parsebyparts/parsebyparts.cpp
@@ -21,12 +21,15 @@ class AsyncDocumentParser {
     AsyncDocumentParser(Document& d)
         : stream_(*this)
         , d_(d)
-        , parseThread_(&AsyncDocumentParser::Parse, this)
+        , parseThread_()
         , mutex_()
         , notEmpty_()
         , finish_()
         , completed_()
-    {}
+    {
+        // Create and execute thread after all member variables are initialized.
+        parseThread_ = std::thread(&AsyncDocumentParser::Parse, this);
+    }
 
     ~AsyncDocumentParser() {
         if (!parseThread_.joinable())

From 3e2172bd52308bc57db0b5930347ce451b6cc0f8 Mon Sep 17 00:00:00 2001
From: Milo Yip <miloyip@gmail.com>
Date: Sat, 3 Sep 2016 23:37:00 +0800
Subject: [PATCH 2/2] Add preconditions in writer and string functions

---
 include/rapidjson/internal/strfunc.h | 3 +++
 include/rapidjson/prettywriter.h     | 8 +++++++-
 include/rapidjson/writer.h           | 8 +++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/include/rapidjson/internal/strfunc.h b/include/rapidjson/internal/strfunc.h
index 2edfae526..de41d8f9c 100644
--- a/include/rapidjson/internal/strfunc.h
+++ b/include/rapidjson/internal/strfunc.h
@@ -28,6 +28,7 @@ namespace internal {
 */
 template <typename Ch>
 inline SizeType StrLen(const Ch* s) {
+    RAPIDJSON_ASSERT(s != 0);
     const Ch* p = s;
     while (*p) ++p;
     return SizeType(p - s);
@@ -36,6 +37,8 @@ inline SizeType StrLen(const Ch* s) {
 //! Returns number of code points in a encoded string.
 template<typename Encoding>
 bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {
+    RAPIDJSON_ASSERT(s != 0);
+    RAPIDJSON_ASSERT(outCount != 0);
     GenericStringStream<Encoding> is(s);
     const typename Encoding::Ch* end = s + length;
     SizeType count = 0;
diff --git a/include/rapidjson/prettywriter.h b/include/rapidjson/prettywriter.h
index 0dcb0fee9..c6f0216e9 100644
--- a/include/rapidjson/prettywriter.h
+++ b/include/rapidjson/prettywriter.h
@@ -91,12 +91,14 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
     bool Double(double d)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
 
     bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
+        RAPIDJSON_ASSERT(str != 0);
         (void)copy;
         PrettyPrefix(kNumberType);
         return Base::WriteString(str, length);
     }
 
     bool String(const Ch* str, SizeType length, bool copy = false) {
+        RAPIDJSON_ASSERT(str != 0);
         (void)copy;
         PrettyPrefix(kStringType);
         return Base::WriteString(str, length);
@@ -184,7 +186,11 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
         \param type Type of the root of json.
         \note When using PrettyWriter::RawValue(), the result json may not be indented correctly.
     */
-    bool RawValue(const Ch* json, size_t length, Type type) { PrettyPrefix(type); return Base::WriteRawValue(json, length); }
+    bool RawValue(const Ch* json, size_t length, Type type) {
+        RAPIDJSON_ASSERT(json != 0);
+        PrettyPrefix(type);
+        return Base::WriteRawValue(json, length);
+    }
 
 protected:
     void PrettyPrefix(Type type) {
diff --git a/include/rapidjson/writer.h b/include/rapidjson/writer.h
index 94f22dd5f..c5a3b98a9 100644
--- a/include/rapidjson/writer.h
+++ b/include/rapidjson/writer.h
@@ -184,12 +184,14 @@ class Writer {
     bool Double(double d)       { Prefix(kNumberType); return EndValue(WriteDouble(d)); }
 
     bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
+        RAPIDJSON_ASSERT(str != 0);
         (void)copy;
         Prefix(kNumberType);
         return EndValue(WriteString(str, length));
     }
 
     bool String(const Ch* str, SizeType length, bool copy = false) {
+        RAPIDJSON_ASSERT(str != 0);
         (void)copy;
         Prefix(kStringType);
         return EndValue(WriteString(str, length));
@@ -249,7 +251,11 @@ class Writer {
         \param length Length of the json.
         \param type Type of the root of json.
     */
-    bool RawValue(const Ch* json, size_t length, Type type) { Prefix(type); return EndValue(WriteRawValue(json, length)); }
+    bool RawValue(const Ch* json, size_t length, Type type) {
+        RAPIDJSON_ASSERT(json != 0);
+        Prefix(type);
+        return EndValue(WriteRawValue(json, length));
+    }
 
 protected:
     //! Information for each nested level