Merge branch 'master' of ssh://github.com/google/honggfuzz
diff --git a/Makefile b/Makefile
index 835a516..e161567 100644
--- a/Makefile
+++ b/Makefile
@@ -154,8 +154,8 @@
.PHONY:android
android:
- ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./android/Android.mk \
- APP_PLATFORM=$(ANDROID_API) APP_ABI=$(ANDROID_APP_ABI) $(NDK_BUILD_ARGS)
+ ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./android/Android.mk \
+ APP_PLATFORM=$(ANDROID_API) APP_ABI=$(ANDROID_APP_ABI) $(NDK_BUILD_ARGS)
# DO NOT DELETE
diff --git a/fuzz.c b/fuzz.c
index dd158bf..2c7b601 100644
--- a/fuzz.c
+++ b/fuzz.c
@@ -409,7 +409,7 @@
LOGMSG_P(l_FATAL, "sigaction(SIGQUIT) failed");
}
if (sigaction(SIGALRM, &sa, NULL) == -1) {
- LOGMSG_P(l_FATAL, "sigaction(SIGQUIT) failed");
+ LOGMSG_P(l_FATAL, "sigaction(SIGALRM) failed");
}
if (fuzz_setupTimer() == false) {
LOGMSG(l_FATAL, "fuzz_setupTimer()");
diff --git a/linux/ptrace_utils.c b/linux/ptrace_utils.c
index 128a066..755cdb6 100644
--- a/linux/ptrace_utils.c
+++ b/linux/ptrace_utils.c
@@ -828,7 +828,7 @@
arch_ptraceSaveData(hfuzz, pid, fuzzer);
/*
- * An kind of ugly (although necessary) hack due to custom signal handlers
+ * A kind of ugly (although necessary) hack due to custom signal handlers
* in Android from debuggerd. If we pass one of the monitored signals,
* we'll end-up running the processing routine twice. A cost that we
* don't want to pay.