From e8a4bb993d9755d17a0176d60a4b5205fc6f265b Mon Sep 17 00:00:00 2001 From: xuqingqing Date: Wed, 22 Jul 2020 10:53:15 +0800 Subject: [PATCH] fix xCrash 2.5.6's bug for causing normal SIGSEGV and SIGABORT not correctly handled --- src/java/xcrash/build.gradle | 2 +- src/java/xcrash/xcrash_lib/src/main/java/xcrash/Version.java | 2 +- src/native/common/xcc_version.h | 2 +- src/native/libxcrash/jni/xc_crash.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/xcrash/build.gradle b/src/java/xcrash/build.gradle index 3365c96..ec69aac 100644 --- a/src/java/xcrash/build.gradle +++ b/src/java/xcrash/build.gradle @@ -30,7 +30,7 @@ ext { POM_GROUP_ID = "com.iqiyi.xcrash" POM_ARTIFACT_ID = "xcrash-android-lib" - POM_VERSION_NAME = "2.5.6" + POM_VERSION_NAME = "2.5.7" POM_NAME = "xCrash Android Lib" POM_DESCRIPTION = "xCrash provides the Android app with the ability to capture java crash, native crash and ANR." diff --git a/src/java/xcrash/xcrash_lib/src/main/java/xcrash/Version.java b/src/java/xcrash/xcrash_lib/src/main/java/xcrash/Version.java index 116105b..6a8916f 100644 --- a/src/java/xcrash/xcrash_lib/src/main/java/xcrash/Version.java +++ b/src/java/xcrash/xcrash_lib/src/main/java/xcrash/Version.java @@ -27,6 +27,6 @@ class Version { private Version() { } - static final String version = "2.5.6"; + static final String version = "2.5.7"; static final String fullVersion = "xCrash " + version; } diff --git a/src/native/common/xcc_version.h b/src/native/common/xcc_version.h index 475031f..8789ab6 100644 --- a/src/native/common/xcc_version.h +++ b/src/native/common/xcc_version.h @@ -24,6 +24,6 @@ #ifndef XCC_VERSION_H #define XCC_VERSION_H 1 -#define XCC_VERSION_STR "xCrash 2.5.6" +#define XCC_VERSION_STR "xCrash 2.5.7" #endif diff --git a/src/native/libxcrash/jni/xc_crash.c b/src/native/libxcrash/jni/xc_crash.c index 099351c..997522f 100644 --- a/src/native/libxcrash/jni/xc_crash.c +++ b/src/native/libxcrash/jni/xc_crash.c @@ -416,7 +416,7 @@ static void xc_crash_signal_handler(int sig, siginfo_t *si, void *uc) if(6 == sig || 11 == sig) //SIGABRT(6), SIGSEGV(11) { - if(XC_TRACE_DUMP_NOT_START == xc_trace_dump_status) + if(XC_TRACE_DUMP_ON_GOING == xc_trace_dump_status) { xc_trace_dump_status = XC_TRACE_DUMP_ART_CRASH; XCD_LOG_WARN("meet error sig(%d) while calling ART dump trace\n", sig);