diff options
| author | Leonard Mosescu <mosescu@chromium.org> | 2017-07-06 10:58:40 -0700 |
|---|---|---|
| committer | Mark Mentovai <mark@chromium.org> | 2017-07-11 17:24:47 +0000 |
| commit | 5f112cb1743aa832bcb14530bd98cbacf0f49df4 (patch) | |
| tree | 3fd1bca50e45c4ccfc077e9a7c01224a8ad4b4ec | |
| parent | Fix asan builds (diff) | |
| download | breakpad-5f112cb1743aa832bcb14530bd98cbacf0f49df4.tar.xz | |
A couple of minor fixes
1. Fixing ExceptionHandlerTest.FirstChanceHandlerRuns:
exit() is not an async-signal-safe function (http://man7.org/linux/man-pages/man7/signal-safety.7.html)
2. Fixing entry point signature in minidump_dump
Changed "const char* argv[]" to "char* argv[]" to match the standard entry point signature
3. Updating .gitignore to exclude unit test artifacts
Change-Id: I9662898d0bd97769621fb6476a720105821c60f0
Reviewed-on: https://chromium-review.googlesource.com/562356
Reviewed-by: Mark Mentovai <mark@chromium.org>
Reviewed-by: Ivan Penkov <ivanpe@chromium.org>
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | src/client/linux/handler/exception_handler_unittest.cc | 2 | ||||
| -rw-r--r-- | src/processor/minidump_dump.cc | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -50,6 +50,11 @@ lib*.a /src/tools/mac/dump_syms/dump_syms /src/tools/mac/dump_syms/dump_syms_mac +# Ignore unit test artifacts. +*_unittest +*.log +*.trs + # Ignore autotools generated artifacts. .deps .dirstamp diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc index eda60c95..193a76e7 100644 --- a/src/client/linux/handler/exception_handler_unittest.cc +++ b/src/client/linux/handler/exception_handler_unittest.cc @@ -468,7 +468,7 @@ TEST(ExceptionHandlerTest, StackedHandlersUnhandledToBottom) { namespace { const int kSimpleFirstChanceReturnStatus = 42; bool SimpleFirstChanceHandler(int, void*, void*) { - exit(kSimpleFirstChanceReturnStatus); + _exit(kSimpleFirstChanceReturnStatus); } } diff --git a/src/processor/minidump_dump.cc b/src/processor/minidump_dump.cc index 4d916276..b9b7555e 100644 --- a/src/processor/minidump_dump.cc +++ b/src/processor/minidump_dump.cc @@ -212,7 +212,7 @@ static bool PrintMinidumpDump(const Options& options) { //============================================================================= static void -Usage(int argc, const char *argv[], bool error) { +Usage(int argc, char *argv[], bool error) { FILE *fp = error ? stderr : stdout; fprintf(fp, @@ -228,7 +228,7 @@ Usage(int argc, const char *argv[], bool error) { //============================================================================= static void -SetupOptions(int argc, const char *argv[], Options *options) { +SetupOptions(int argc, char *argv[], Options *options) { int ch; while ((ch = getopt(argc, (char * const *)argv, "xh")) != -1) { @@ -257,7 +257,7 @@ SetupOptions(int argc, const char *argv[], Options *options) { } // namespace -int main(int argc, const char *argv[]) { +int main(int argc, char *argv[]) { Options options; BPLOG_INIT(&argc, &argv); SetupOptions(argc, argv, &options); |