Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

protoc: parser rejects explicit use of map_entry option (#13479) #13527

Closed
wants to merge 1 commit into from
Closed

protoc: parser rejects explicit use of map_entry option (#13479) #13527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions src/google/protobuf/compiler/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,26 @@ void Parser::SkipRestOfBlock() {

// ===================================================================

bool Parser::ValidateMessage(const DescriptorProto* proto) {
for (int i = 0; i < proto->options().uninterpreted_option_size(); i++) {
const UninterpretedOption& option =
proto->options().uninterpreted_option(i);
if (option.name_size() > 0 && !option.name(0).is_extension() &&
option.name(0).name_part() == "map_entry") {
int line = -1, col = 0; // indicates line and column not known
if (source_location_table_ != nullptr) {
source_location_table_->Find(
&option, DescriptorPool::ErrorCollector::OPTION_NAME, &line, &col);
}
RecordError(line, col,
"map_entry should not be set explicitly. "
"Use map<KeyType, ValueType> instead.");
return false;
}
}
return true;
}

bool Parser::ValidateEnum(const EnumDescriptorProto* proto) {
bool has_allow_alias = false;
bool allow_alias = false;
Expand Down Expand Up @@ -661,9 +681,8 @@ bool Parser::Parse(io::Tokenizer* input, FileDescriptorProto* file) {
root_location.RecordLegacyLocation(file,
DescriptorPool::ErrorCollector::OTHER);

if (require_syntax_identifier_ || LookingAt("syntax")
|| LookingAt("edition")
) {
if (require_syntax_identifier_ || LookingAt("syntax") ||
LookingAt("edition")) {
if (!ParseSyntaxIdentifier(file, root_location)) {
// Don't attempt to parse the file if we didn't recognize the syntax
// identifier.
Expand Down Expand Up @@ -867,6 +886,7 @@ bool IsMessageSetWireFormatMessage(const DescriptorProto& message) {
for (int i = 0; i < options.uninterpreted_option_size(); ++i) {
const UninterpretedOption& uninterpreted = options.uninterpreted_option(i);
if (uninterpreted.name_size() == 1 &&
!uninterpreted.name(0).is_extension() &&
uninterpreted.name(0).name_part() == "message_set_wire_format" &&
uninterpreted.identifier_value() == "true") {
return true;
Expand Down Expand Up @@ -931,6 +951,9 @@ bool Parser::ParseMessageBlock(DescriptorProto* message,
if (message->reserved_range_size() > 0) {
AdjustReservedRangesWithMaxEndNumber(message);
}

DO(ValidateMessage(message));

return true;
}

Expand Down
1 change: 1 addition & 0 deletions src/google/protobuf/compiler/parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ class PROTOBUF_EXPORT Parser {
return syntax_identifier_ == "proto3";
}

bool ValidateMessage(const DescriptorProto* proto);
bool ValidateEnum(const EnumDescriptorProto* proto);

// =================================================================
Expand Down
10 changes: 5 additions & 5 deletions src/google/protobuf/compiler/parser_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ class ParserTest : public testing::Test {
// input.
void ExpectHasEarlyExitErrors(const char* text, const char* expected_errors) {
SetupParser(text);
SourceLocationTable source_locations;
parser_->RecordSourceLocationsTo(&source_locations);
FileDescriptorProto file;
EXPECT_FALSE(parser_->Parse(input_.get(), &file));
EXPECT_EQ(expected_errors, error_collector_.text_);
Expand Down Expand Up @@ -2332,17 +2334,16 @@ TEST_F(ParserValidationErrorTest, EnumValueAliasError) {
}

TEST_F(ParserValidationErrorTest, ExplicitlyMapEntryError) {
ExpectHasValidationErrors(
ExpectHasErrors(
"message Foo {\n"
" message ValueEntry {\n"
" option map_entry = true;\n"
" optional int32 key = 1;\n"
" optional int32 value = 2;\n"
" extensions 99 to 999;\n"
" }\n"
" repeated ValueEntry value = 1;\n"
"}",
"7:11: map_entry should not be set explicitly. Use "
"2:11: map_entry should not be set explicitly. Use "
"map<KeyType, ValueType> instead.\n");
}

Expand Down Expand Up @@ -3047,7 +3048,7 @@ class SourceInfoTest : public ParserTest {
}
}

return false;
return false;
}

private:
Expand Down Expand Up @@ -4240,7 +4241,6 @@ TEST_F(ParseEditionsTest, FeaturesWithoutEditions) {
}



} // anonymous namespace

} // namespace compiler
Expand Down
Loading