Merge pull request #347 from pietern/unstable-segv

Force SIGSEGV without HAVE_BACKTRACE (unstable)

diff --git a/src/config.h b/src/config.h
index f38ce872ede1961f74828975abeb56337abb2b31..323a3ddd1f43b00678aae3a4e87c93b0edc9a117 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -25,7 +25,7 @@
 #endif
 
 /* Test for backtrace() */
-#if defined(__APPLE__) || defined(__linux__)
+#if defined(__APPLE__) || defined(__linux__) || defined(__sun)
 #define HAVE_BACKTRACE 1
 #endif
 

diff --git a/src/debug.c b/src/debug.c
index fe21531ba51ad35a673871d4ba7835bda58a9f3e..a355df05f6dc65fdc203374678a6909644c10d37 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -314,8 +314,8 @@ void _redisAssert(char *estr, char *file, int line) {
     server.assert_file = file;
     server.assert_line = line;
     redisLog(REDIS_WARNING,"(forcing SIGSEGV to print the bug report.)");
-    *((char*)-1) = 'x';
 #endif
+    *((char*)-1) = 'x';
 }
 
 void _redisAssertPrintClientInfo(redisClient *c) {
@@ -384,9 +384,9 @@ void _redisPanic(char *msg, char *file, int line) {
     redisLog(REDIS_WARNING,"Guru Meditation: %s #%s:%d",msg,file,line);
 #ifdef HAVE_BACKTRACE
     redisLog(REDIS_WARNING,"(forcing SIGSEGV in order to print the stack trace)");
+#endif
     redisLog(REDIS_WARNING,"------------------------------------------------");
     *((char*)-1) = 'x';
-#endif
 }
 
 void bugReportStart(void) {