organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #1828 from sergiocampama/framework

Browse source 
Fixes the parsing of the proto-framework map file.
This commit is contained in:
Feng Xiao 2016-07-22 20:51:13 +00:00 • committed by GitHub
commit de5236dc9f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/compiler/objectivec/objectivec_file.cc
View file

@ -223,7 +223,7 @@ bool ImportWriter::ProtoFrameworkCollector::ConsumeLine(
offset = proto_file_list.length();
}
StringPiece proto_file(proto_file_list, start, offset);
StringPiece proto_file(proto_file_list, start, offset - start);
StringPieceTrimWhitespace(&proto_file);
if (proto_file.size() != 0) {
map<string, string>::iterator existing_entry =

3
src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
View file

@ -1306,7 +1306,8 @@ bool Parser::Finish() {
return true;
}
// Force a newline onto the end to finish parsing.
p_ = StringPiece(leftover_ + "\n");
leftover_ += "\n";
p_ = StringPiece(leftover_);
if (!ParseLoop()) {
return false;
}