Fix ZeroCopyCodedInputStream::ReadCord
PiperOrigin-RevId: 500390065
diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc
index 7c9ff37..babcc19 100644
--- a/src/google/protobuf/generated_message_reflection.cc
+++ b/src/google/protobuf/generated_message_reflection.cc
@@ -240,12 +240,6 @@
<< value->full_name();
}
-inline void CheckInvalidAccess(const internal::ReflectionSchema& schema,
- const FieldDescriptor* field) {
- GOOGLE_ABSL_CHECK(!schema.IsFieldStripped(field))
- << "invalid access to a stripped field " << field->full_name();
-}
-
#define USAGE_CHECK(CONDITION, METHOD, ERROR_DESCRIPTION) \
if (!(CONDITION)) \
ReportReflectionUsageError(descriptor_, field, #METHOD, ERROR_DESCRIPTION)
@@ -1081,7 +1075,6 @@
const Message* prototype =
message_factory_->GetPrototype(message1->GetDescriptor());
for (const auto* field : fields) {
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
if (unsafe_shallow_swap) {
MutableExtensionSet(message1)->UnsafeShallowSwapExtension(
@@ -1152,7 +1145,6 @@
const FieldDescriptor* field) const {
USAGE_CHECK_MESSAGE_TYPE(HasField);
USAGE_CHECK_SINGULAR(HasField);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
return GetExtensionSet(message).Has(field->number());
@@ -1178,7 +1170,6 @@
for (int i = 0; i <= last_non_weak_field_index_; i++) {
const FieldDescriptor* field = descriptor_->field(i);
if (schema_.InRealOneof(field)) continue;
- if (schema_.IsFieldStripped(field)) continue;
if (schema_.IsSplit(field)) {
continue;
}
@@ -1252,7 +1243,6 @@
const FieldDescriptor* field) const {
USAGE_CHECK_MESSAGE_TYPE(FieldSize);
USAGE_CHECK_REPEATED(FieldSize);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
return GetExtensionSet(message).ExtensionSize(field->number());
@@ -1297,7 +1287,6 @@
void Reflection::ClearField(Message* message,
const FieldDescriptor* field) const {
USAGE_CHECK_MESSAGE_TYPE(ClearField);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
MutableExtensionSet(message)->ClearExtension(field->number());
@@ -1408,7 +1397,6 @@
const FieldDescriptor* field) const {
USAGE_CHECK_MESSAGE_TYPE(RemoveLast);
USAGE_CHECK_REPEATED(RemoveLast);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
MutableExtensionSet(message)->RemoveLast(field->number());
@@ -1456,7 +1444,6 @@
Message* Reflection::ReleaseLast(Message* message,
const FieldDescriptor* field) const {
USAGE_CHECK_ALL(ReleaseLast, REPEATED, MESSAGE);
- CheckInvalidAccess(schema_, field);
Message* released;
if (field->is_extension()) {
@@ -1482,7 +1469,6 @@
Message* Reflection::UnsafeArenaReleaseLast(
Message* message, const FieldDescriptor* field) const {
USAGE_CHECK_ALL(UnsafeArenaReleaseLast, REPEATED, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
return static_cast<Message*>(
@@ -1503,7 +1489,6 @@
int index1, int index2) const {
USAGE_CHECK_MESSAGE_TYPE(Swap);
USAGE_CHECK_REPEATED(Swap);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
MutableExtensionSet(message)->SwapElements(field->number(), index1, index2);
@@ -1575,9 +1560,8 @@
} // namespace internal
using internal::CreateUnknownEnumValues;
-void Reflection::ListFieldsMayFailOnStripped(
- const Message& message, bool should_fail,
- std::vector<const FieldDescriptor*>* output) const {
+void Reflection::ListFields(const Message& message,
+ std::vector<const FieldDescriptor*>* output) const {
output->clear();
// Optimization: The default instance never has any fields set.
@@ -1601,9 +1585,6 @@
};
for (int i = 0; i <= last_non_weak_field_index; i++) {
const FieldDescriptor* field = descriptor_->field(i);
- if (!should_fail && schema_.IsFieldStripped(field)) {
- continue;
- }
if (field->is_repeated()) {
if (FieldSize(message, field) > 0) {
append_to_output(field);
@@ -1620,7 +1601,6 @@
append_to_output(field);
}
} else if (has_bits && has_bits_indices[i] != static_cast<uint32_t>(-1)) {
- CheckInvalidAccess(schema_, field);
// Equivalent to: HasBit(message, field)
if (IsIndexInHasBitSet(has_bits, has_bits_indices[i])) {
append_to_output(field);
@@ -1657,16 +1637,6 @@
}
}
-void Reflection::ListFields(const Message& message,
- std::vector<const FieldDescriptor*>* output) const {
- ListFieldsMayFailOnStripped(message, true, output);
-}
-
-void Reflection::ListFieldsOmitStripped(
- const Message& message, std::vector<const FieldDescriptor*>* output) const {
- ListFieldsMayFailOnStripped(message, false, output);
-}
-
// -------------------------------------------------------------------
#undef DEFINE_PRIMITIVE_ACCESSORS
@@ -2089,7 +2059,6 @@
const FieldDescriptor* field,
MessageFactory* factory) const {
USAGE_CHECK_ALL(GetMessage, SINGULAR, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (factory == nullptr) factory = message_factory_;
@@ -2112,7 +2081,6 @@
const FieldDescriptor* field,
MessageFactory* factory) const {
USAGE_CHECK_ALL(MutableMessage, SINGULAR, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (factory == nullptr) factory = message_factory_;
@@ -2148,7 +2116,6 @@
Message* message, Message* sub_message,
const FieldDescriptor* field) const {
USAGE_CHECK_ALL(SetAllocatedMessage, SINGULAR, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
@@ -2184,7 +2151,6 @@
GOOGLE_ABSL_DCHECK(
sub_message == nullptr || sub_message->GetOwningArena() == nullptr ||
sub_message->GetOwningArena() == message->GetArenaForAllocation());
- CheckInvalidAccess(schema_, field);
// If message and sub-message are in different memory ownership domains
// (different arenas, or one is on heap and one is not), then we may need to
@@ -2215,7 +2181,6 @@
const FieldDescriptor* field,
MessageFactory* factory) const {
USAGE_CHECK_ALL(ReleaseMessage, SINGULAR, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (factory == nullptr) factory = message_factory_;
@@ -2244,8 +2209,6 @@
Message* Reflection::ReleaseMessage(Message* message,
const FieldDescriptor* field,
MessageFactory* factory) const {
- CheckInvalidAccess(schema_, field);
-
Message* released = UnsafeArenaReleaseMessage(message, field, factory);
#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
released = MaybeForceCopy(message->GetArenaForAllocation(), released);
@@ -2262,7 +2225,6 @@
const FieldDescriptor* field,
int index) const {
USAGE_CHECK_ALL(GetRepeatedMessage, REPEATED, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
return static_cast<const Message&>(
@@ -2283,7 +2245,6 @@
const FieldDescriptor* field,
int index) const {
USAGE_CHECK_ALL(MutableRepeatedMessage, REPEATED, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
return static_cast<Message*>(
@@ -2304,7 +2265,6 @@
Message* Reflection::AddMessage(Message* message, const FieldDescriptor* field,
MessageFactory* factory) const {
USAGE_CHECK_ALL(AddMessage, REPEATED, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (factory == nullptr) factory = message_factory_;
@@ -2347,7 +2307,6 @@
const FieldDescriptor* field,
Message* new_entry) const {
USAGE_CHECK_ALL(AddAllocatedMessage, REPEATED, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
MutableExtensionSet(message)->AddAllocatedMessage(field, new_entry);
@@ -2367,7 +2326,6 @@
const FieldDescriptor* field,
Message* new_entry) const {
USAGE_CHECK_ALL(UnsafeArenaAddAllocatedMessage, REPEATED, MESSAGE);
- CheckInvalidAccess(schema_, field);
if (field->is_extension()) {
MutableExtensionSet(message)->UnsafeArenaAddAllocatedMessage(field,
@@ -2391,7 +2349,6 @@
const Descriptor* desc) const {
(void)ctype; // Parameter is used by Google-internal code.
USAGE_CHECK_REPEATED("MutableRawRepeatedField");
- CheckInvalidAccess(schema_, field);
if (field->cpp_type() != cpptype &&
(field->cpp_type() != FieldDescriptor::CPPTYPE_ENUM ||
@@ -2690,9 +2647,6 @@
return IsIndexInHasBitSet(GetHasBits(message), schema_.HasBitIndex(field));
}
- // Intentionally check here because HasBitIndex(field) != -1 means valid.
- CheckInvalidAccess(schema_, field);
-
// proto3: no has-bits. All fields present except messages, which are
// present only if their message-field pointer is non-null.
if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
@@ -3277,8 +3231,6 @@
std::vector<int> inlined_string_indices = has_bit_indices;
for (int i = 0; i < descriptor_->field_count(); ++i) {
auto* field = descriptor_->field(i);
- if (schema_.IsFieldStripped(field)) continue;
-
fields.push_back(field);
has_bit_indices[static_cast<size_t>(field->index())] =
static_cast<int>(schema_.HasBitIndex(field));
@@ -3624,7 +3576,7 @@
bool IsDescendant(Message& root, const Message& message) {
const Reflection* reflection = root.GetReflection();
std::vector<const FieldDescriptor*> fields;
- reflection->ListFieldsOmitStripped(root, &fields);
+ reflection->ListFields(root, &fields);
for (const auto* field : fields) {
// Skip non-message fields.
diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h
index 1b5485b..4561a94 100644
--- a/src/google/protobuf/generated_message_reflection.h
+++ b/src/google/protobuf/generated_message_reflection.h
@@ -236,16 +236,6 @@
return false;
}
- bool IsFieldStripped(const FieldDescriptor* field) const {
- (void)field;
- return false;
- }
-
- bool IsMessageStripped(const Descriptor* descriptor) const {
- (void)descriptor;
- return false;
- }
-
bool IsSplit() const { return split_offset_ != -1; }
bool IsSplit(const FieldDescriptor* field) const {
diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h
index 8317c92..eb61237 100644
--- a/src/google/protobuf/message.h
+++ b/src/google/protobuf/message.h
@@ -1024,22 +1024,6 @@
const internal::RepeatedFieldAccessor* RepeatedFieldAccessor(
const FieldDescriptor* field) const;
- // Lists all fields of the message which are currently set, except for unknown
- // fields and stripped fields. See ListFields for details.
- void ListFieldsOmitStripped(
- const Message& message,
- std::vector<const FieldDescriptor*>* output) const;
-
- bool IsMessageStripped(const Descriptor* descriptor) const {
- return schema_.IsMessageStripped(descriptor);
- }
-
- friend class TextFormat;
-
- void ListFieldsMayFailOnStripped(
- const Message& message, bool should_fail,
- std::vector<const FieldDescriptor*>* output) const;
-
// Returns true if the message field is backed by a LazyField.
//
// A message field may be backed by a LazyField without the user annotation
diff --git a/src/google/protobuf/message_lite.cc b/src/google/protobuf/message_lite.cc
index fc0f56a..7aff233 100644
--- a/src/google/protobuf/message_lite.cc
+++ b/src/google/protobuf/message_lite.cc
@@ -204,6 +204,7 @@
bool aliasing_enabled() { return cis_->aliasing_enabled_; }
bool ReadCord(absl::Cord* cord, int count) final {
+ GOOGLE_ABSL_LOG(FATAL) << "Bad ReadCord";
return cis_->ReadCord(cord, count);
}
private:
diff --git a/src/google/protobuf/reflection_ops.cc b/src/google/protobuf/reflection_ops.cc
index 67b12f6..59c476b 100644
--- a/src/google/protobuf/reflection_ops.cc
+++ b/src/google/protobuf/reflection_ops.cc
@@ -87,7 +87,7 @@
google::protobuf::MessageFactory::generated_factory());
std::vector<const FieldDescriptor*> fields;
- from_reflection->ListFieldsOmitStripped(from, &fields);
+ from_reflection->ListFields(from, &fields);
for (const FieldDescriptor* field : fields) {
if (field->is_repeated()) {
// Use map reflection if both are in map status and have the
@@ -182,7 +182,7 @@
const Reflection* reflection = GetReflectionOrDie(*message);
std::vector<const FieldDescriptor*> fields;
- reflection->ListFieldsOmitStripped(*message, &fields);
+ reflection->ListFields(*message, &fields);
for (const FieldDescriptor* field : fields) {
reflection->ClearField(message, field);
}
@@ -274,7 +274,7 @@
std::vector<const FieldDescriptor*> fields;
// Should be safe to skip stripped fields because required fields are not
// stripped.
- reflection->ListFieldsOmitStripped(message, &fields);
+ reflection->ListFields(message, &fields);
for (const FieldDescriptor* field : fields) {
if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
@@ -403,7 +403,7 @@
// Check sub-messages.
std::vector<const FieldDescriptor*> fields;
- reflection->ListFieldsOmitStripped(message, &fields);
+ reflection->ListFields(message, &fields);
for (const FieldDescriptor* field : fields) {
if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
diff --git a/src/google/protobuf/text_format.cc b/src/google/protobuf/text_format.cc
index 3623bcb..abf0bfd 100644
--- a/src/google/protobuf/text_format.cc
+++ b/src/google/protobuf/text_format.cc
@@ -2252,10 +2252,7 @@
fields.push_back(descriptor->field(0));
fields.push_back(descriptor->field(1));
} else {
- reflection->ListFieldsOmitStripped(message, &fields);
- if (reflection->IsMessageStripped(message.GetDescriptor())) {
- generator->Print(kDoNotParse, std::strlen(kDoNotParse));
- }
+ reflection->ListFields(message, &fields);
}
if (print_message_fields_in_index_order_) {
