[microdump] Trim newline characters from input lines.

processor/microdump.cc

 // Copyright (c) 2014 Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 58 matching lines @@
 }
 
 std::vector<uint8_t> ParseHexBuf(const string& str) {
   std::vector<uint8_t> buf;
   for (size_t i = 0; i < str.length(); i += 2) {
     buf.push_back(HexStrToL<uint8_t>(str.substr(i, 2)));
   }
   return buf;
 }
 
+bool GetLine(std::istringstream* istream, string* str) {
+  if (std::getline(*istream, *str)) {
+    // Trim any trailing newline from the end of the line. Allows us
+    // to seamlessly handle both Windows/DOS and Unix formatted input. The
+    // adb tool generally writes logcat dumps in Windows/DOS format.
+    if (!str->empty() && str->at(str->size() - 1) == '\r') {
+      str->erase(str->size() - 1);
+    }
+    return true;
+  }
+  return false;
+}
+
 }  // namespace
 
 namespace google_breakpad {
 
 //
 // MicrodumpModules
 //
 
 void MicrodumpModules::Add(const CodeModule* module) {
   linked_ptr<const CodeModule> module_ptr(module);
@@ skipping 87 matching lines @@
     system_info_(new SystemInfo()) {
   assert(!contents.empty());
 
   bool in_microdump = false;
   string line;
   uint64_t stack_start = 0;
   std::vector<uint8_t> stack_content;
   string arch;
 
   std::istringstream stream(contents);
-  while (std::getline(stream, line)) {
+  while (GetLine(&stream, &line)) {
     if (line.find(kGoogleBreakpadKey) == string::npos) {
       continue;
     }
     if (line.find(kMicrodumpBegin) != string::npos) {
       in_microdump = true;
       continue;
     }
     if (line.find(kMicrodumpEnd) != string::npos) {
       break;
     }
@@ skipping 10 matching lines @@
       string num_cpus;
       string os_version;
       // This reflect the actual HW arch and might not match the arch emulated
       // for the execution (e.g., running a 32-bit binary on a 64-bit cpu).
       string hw_arch;
 
       os_tokens >> os_id;
       os_tokens >> arch;
       os_tokens >> num_cpus;
       os_tokens >> hw_arch;
-      std::getline(os_tokens, os_version);
+      GetLine(&os_tokens, &os_version);
       os_version.erase(0, 1);  // remove leading space.
 
       system_info_->cpu = hw_arch;
       system_info_->cpu_count = HexStrToL<uint8_t>(num_cpus);
       system_info_->os_version = os_version;
 
       if (os_id == "L") {
         system_info_->os = "Linux";
         system_info_->os_short = "linux";
       } else if (os_id == "A") {
@@ skipping 69 matching lines @@
           filename,                   // debug_file
           identifier,                 // debug_identifier
           ""));                       // version
     }
   }
   stack_region_->Init(stack_start, stack_content);
 }
 
 }  // namespace google_breakpad