aboutsummaryrefslogtreecommitdiff
path: root/src/tools/linux/md2core/minidump-2-core.cc
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-05-06 23:33:02 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-05-06 23:33:02 +0000
commit85c352695f41b3c4bab8773bc2ace5a730dff2b7 (patch)
treeb7aee2a86524351e2fea610426bcfe1055004e53 /src/tools/linux/md2core/minidump-2-core.cc
parentFix an "unused variable" compiler warning in exploitability_win.cc (diff)
downloadbreakpad-85c352695f41b3c4bab8773bc2ace5a730dff2b7.tar.xz
Add MD_OS_NACL platform_id value for identifying NaCl minidumps
Change minidump-2-core to accept minidumps with this platform_id value rather than rejecting them as non-Linux dumps. Add a missing "break" for a MD_OS_PS3 case. BUG= https://code.google.com/p/nativeclient/issues/detail?id=3424 TEST= tested with work-in-progress NaCl minidump generator Review URL: https://breakpad.appspot.com/590002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1172 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/tools/linux/md2core/minidump-2-core.cc')
-rw-r--r--src/tools/linux/md2core/minidump-2-core.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc
index 93c46aab..333a0e58 100644
--- a/src/tools/linux/md2core/minidump-2-core.cc
+++ b/src/tools/linux/md2core/minidump-2-core.cc
@@ -425,8 +425,9 @@ ParseSystemInfo(CrashedProcess* crashinfo, const MinidumpMemoryRange& range,
#error "This code has not been ported to your platform yet"
#endif
if (!strstr(full_file.GetAsciiMDString(sysinfo->csd_version_rva).c_str(),
- "Linux")) {
- fprintf(stderr, "This minidump was not generated by Linux.\n");
+ "Linux") &&
+ sysinfo->platform_id != MD_OS_NACL) {
+ fprintf(stderr, "This minidump was not generated by Linux or NaCl.\n");
_exit(1);
}