Linux: Breakpad updates.

breakpad/linux/linux_dumper.cc

 // Copyright (c) 2009, 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 108 matching lines @@
   memcpy(maps_path + 6 + pid_len, "/maps", 6);
 
   const int fd = sys_open(maps_path, O_RDONLY, 0);
   if (fd < 0)
     return false;
   LineReader *const line_reader = new(allocator_) LineReader(fd);
 
   const char *line;
   unsigned line_len;
   while (line_reader->GetNextLine(&line, &line_len)) {
-    uintptr_t start_addr;
-    uintptr_t end_addr;
+    uintptr_t start_addr, end_addr, offset;
 
     const char* i1 = my_read_hex_ptr(&start_addr, line);
     if (*i1 == '-') {
       const char *i2 = my_read_hex_ptr(&end_addr, i1 + 1);
       if (*i2 == ' ') {
-        MappingInfo *const module = new(allocator_) MappingInfo;
-        memset(module, 0, sizeof(MappingInfo));
-        module->start_addr = start_addr;
-        module->size = end_addr - start_addr;
-        const char *name = NULL;
-        // Only copy name if the name is a valid path name.
-        if ((name = my_strchr(line, '/')) != NULL) {
-          const unsigned l = my_strlen(name);
-          if (l < sizeof(module->name))
-            memcpy(module->name, name, l);
+        const char *i3 = my_read_hex_ptr(&offset, i2 + 6 /* skip ' rwxp ' */);
+        if (*i3 == ' ') {
+          MappingInfo *const module = new(allocator_) MappingInfo;
+          memset(module, 0, sizeof(MappingInfo));
+          module->start_addr = start_addr;
+          module->size = end_addr - start_addr;
+          module->offset = offset;
+          const char *name = NULL;
+          // Only copy name if the name is a valid path name.
+          if ((name = my_strchr(line, '/')) != NULL) {
+            const unsigned l = my_strlen(name);
+            if (l < sizeof(module->name))
+              memcpy(module->name, name, l);
+          }
+
+          result->push_back(module);
         }
-
-        result->push_back(module);
       }
     }
 
     line_reader->PopLine(line_len);
   }
 
   sys_close(fd);
   return result->size() > 0;
 }
 
@@ skipping 164 matching lines @@
   for (size_t i = 0; i < mappings_.size(); ++i) {
     const uintptr_t start = static_cast<uintptr_t>(mappings_[i]->start_addr);
     if (addr >= start && addr - start < mappings_[i]->size)
       return mappings_[i];
   }
 
   return NULL;
 }
 
 }  // namespace google_breakpad