Merge pull request #1828 from sergiocampama/framework

Fixes the parsing of the proto-framework map file.

src/google/protobuf/compiler/objectivec/objectivec_file.cc

@@ -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 =

src/google/protobuf/compiler/objectivec/objectivec_helpers.cc

@@ -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;
   }