generic-library/breakpad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge trunk r1050 to chrome_23 branch.

Browse Source 
Fix a parsing error in the Linux dump writer.

Original Review URL: https://breakpad.appspot.com/464002
Review URL: https://breakpad.appspot.com/471002

git-svn-id: http://google-breakpad.googlecode.com/svn/branches/chrome_23@1054 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
thestig@chromium.org
2012-09-26 20:17:22 +00:00
parent 98c713bdea
commit 4a38b70a14
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/linux/minidump_writer/minidump_writer.cc
View File

@@ -62,9 +62,6 @@
#include <algorithm> #include <algorithm>
#include "client/minidump_file_writer.h"
#include "google_breakpad/common/minidump_format.h"
#include "client/linux/handler/exception_handler.h" #include "client/linux/handler/exception_handler.h"
#include "client/linux/minidump_writer/line_reader.h" #include "client/linux/minidump_writer/line_reader.h"
#include "client/linux/minidump_writer/linux_dumper.h" #include "client/linux/minidump_writer/linux_dumper.h"
@@ -1150,8 +1147,14 @@ class MinidumpWriter {
if (space_ptr != value) if (space_ptr != value)
continue; continue;
// skip past the colon and all the spaces that follow
do {
value++;
} while (my_isspace(*value));
uintptr_t val; uintptr_t val;
my_read_decimal_ptr(&val, ++value); if (my_read_decimal_ptr(&val, value) == value)
continue;
entry->value = static_cast<int>(val); entry->value = static_cast<int>(val);
entry->found = true; entry->found = true;
} }
@@ -1163,7 +1166,7 @@ class MinidumpWriter {
if (!value) if (!value)
goto popline; goto popline;
// skip ':" and all the spaces that follows // skip past the colon and all the spaces that follow
do { do {
value++; value++;
} while (my_isspace(*value)); } while (my_isspace(*value));