Merge 75e9950 into 01950eb

Tencent · Apr 28, 2019 · 9ccdfd6 · 9ccdfd6
2 parents 01950eb + 75e9950
commit 9ccdfd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/example/sortkeys/sortkeys.cpp b/example/sortkeys/sortkeys.cpp
@@ -45,9 +45,8 @@ int main() {
 // C++11 supports std::move() of Value so it always have no problem for std::sort().
 // Some C++03 implementations of std::sort() requires copy constructor which causes compilation error.
 // Needs a sorting function only depends on std::swap() instead.
-#if __cplusplus >= 201103L || !defined(__GLIBCXX__)
+#if __cplusplus >= 201103L || (!defined(__GLIBCXX__) && (!defined(_MSC_VER) || _MSC_VER >= 1900))
     std::sort(d.MemberBegin(), d.MemberEnd(), NameComparator());
-#endif
 
     printIt(d);
 
@@ -59,4 +58,5 @@ int main() {
   "zeta": false
 }
 */
+#endif
 }
diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
@@ -835,8 +835,10 @@ class GenericValue {
     */
     GenericValue& operator=(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
         if (RAPIDJSON_LIKELY(this != &rhs)) {
-            this->~GenericValue();
-            RawAssign(rhs);
+            GenericValue temp;
+            temp.RawAssign(rhs);    // Save and clear rhs, required if it's a sub-Value of
+            this->~GenericValue();  // this-Value being destroyed, otherwise rhs may be
+            RawAssign(temp);        // used after free here.
         }
         return *this;
     }