Merge pull request Tencent#1989 from adamcalhoon/really-fix-placement-new-alignment

miloyip · web-flow · commit 0d78b1ce9316 · 2022-03-08T17:09:47.000+08:00
Fix the alignment of placement new buffer for GenericValue.
diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h
@@ -1235,8 +1235,8 @@ class GenericValue {
             // return NullValue;
 
             // Use static buffer and placement-new to prevent destruction
-            static char buffer[sizeof(GenericValue)];
-            return *new (buffer) GenericValue();
+            static GenericValue buffer;
+            return *new (reinterpret_cast<char *>(&buffer)) GenericValue();
         }
     }
     template <typename SourceAllocator>

Original file line number	Diff line number	Diff line change
`@@ -1235,8 +1235,8 @@ class GenericValue {`
`1235`	`1235`	`// return NullValue;`
`1236`	`1236`
`1237`	`1237`	`// Use static buffer and placement-new to prevent destruction`
`1238`		`- static char buffer[sizeof(GenericValue)];`
`1239`		`- return *new (buffer) GenericValue();`
	`1238`	`+ static GenericValue buffer;`
	`1239`	`+ return new (reinterpret_cast<char >(&buffer)) GenericValue();`
`1240`	`1240`	`}`
`1241`	`1241`	`}`
`1242`	`1242`	`template <typename SourceAllocator>`