Guard against overalignment in RepeatedPtrField.

ckennelly · copybara-github · commit 954dd58faa14 · 2024-11-22T09:47:31.000-08:00
PiperOrigin-RevId: 699198370
diff --git a/src/google/protobuf/repeated_ptr_field.h b/src/google/protobuf/repeated_ptr_field.h
@@ -907,6 +907,8 @@ class RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
             internal::is_supported_string_type<Element>,
             internal::is_supported_message_type<Element>>::value,
         "We only support string and Message types in RepeatedPtrField.");
+    static_assert(alignof(Element) <= internal::ArenaAlignDefault::align,
+                  "Overaligned types are not supported");
   }
 
  public:

Original file line number	Diff line number	Diff line change
`@@ -907,6 +907,8 @@ class RepeatedPtrField final : private internal::RepeatedPtrFieldBase {`
`907`	`907`	`internal::is_supported_string_type<Element>,`
`908`	`908`	`internal::is_supported_message_type<Element>>::value,`
`909`	`909`	`"We only support string and Message types in RepeatedPtrField.");`
	`910`	`+ static_assert(alignof(Element) <= internal::ArenaAlignDefault::align,`
	`911`	`+ "Overaligned types are not supported");`
`910`	`912`	`}`
`911`	`913`
`912`	`914`	`public:`