summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoronqtam <vik.kirilov@gmail.com>2018-04-30 21:53:13 +0300
committeronqtam <vik.kirilov@gmail.com>2018-05-10 16:18:43 +0300
commitbf2e7577e039c5a669ca1efae2321640533d1783 (patch)
tree59dace3cef1d7ade574c764a20e0348e5c350dce
parentc5b6f4d10f1aff2cab3f559d826fd18d4bb578f5 (diff)
fixed issue #129
-rw-r--r--doctest/doctest.h10
-rw-r--r--doctest/parts/doctest_impl.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/doctest/doctest.h b/doctest/doctest.h
index 26a4f2e..5a5a03b 100644
--- a/doctest/doctest.h
+++ b/doctest/doctest.h
@@ -4482,7 +4482,7 @@ namespace detail
static bool isSet;
static struct sigaction oldSigActions[DOCTEST_COUNTOF(signalDefs)];
static stack_t oldSigStack;
- static char altStackMem[SIGSTKSZ];
+ static char altStackMem[4 * SIGSTKSZ];
static void handleSignal(int sig) {
std::string name = "<unknown signal>";
@@ -4502,7 +4502,7 @@ namespace detail
isSet = true;
stack_t sigStack;
sigStack.ss_sp = altStackMem;
- sigStack.ss_size = SIGSTKSZ;
+ sigStack.ss_size = sizeof(altStackMem);
sigStack.ss_flags = 0;
sigaltstack(&sigStack, &oldSigStack);
struct sigaction sa = {0};
@@ -4528,10 +4528,10 @@ namespace detail
}
};
- bool FatalConditionHandler::isSet = false;
+ bool FatalConditionHandler::isSet = false;
struct sigaction FatalConditionHandler::oldSigActions[DOCTEST_COUNTOF(signalDefs)] = {};
- stack_t FatalConditionHandler::oldSigStack = {};
- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
+ stack_t FatalConditionHandler::oldSigStack = {};
+ char FatalConditionHandler::altStackMem[] = {};
#endif // DOCTEST_PLATFORM_WINDOWS
#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH
diff --git a/doctest/parts/doctest_impl.h b/doctest/parts/doctest_impl.h
index eda3efc..c1fc382 100644
--- a/doctest/parts/doctest_impl.h
+++ b/doctest/parts/doctest_impl.h
@@ -1282,7 +1282,7 @@ namespace detail
static bool isSet;
static struct sigaction oldSigActions[DOCTEST_COUNTOF(signalDefs)];
static stack_t oldSigStack;
- static char altStackMem[SIGSTKSZ];
+ static char altStackMem[4 * SIGSTKSZ];
static void handleSignal(int sig) {
std::string name = "<unknown signal>";
@@ -1302,7 +1302,7 @@ namespace detail
isSet = true;
stack_t sigStack;
sigStack.ss_sp = altStackMem;
- sigStack.ss_size = SIGSTKSZ;
+ sigStack.ss_size = sizeof(altStackMem);
sigStack.ss_flags = 0;
sigaltstack(&sigStack, &oldSigStack);
struct sigaction sa = {0};
@@ -1328,10 +1328,10 @@ namespace detail
}
};
- bool FatalConditionHandler::isSet = false;
+ bool FatalConditionHandler::isSet = false;
struct sigaction FatalConditionHandler::oldSigActions[DOCTEST_COUNTOF(signalDefs)] = {};
- stack_t FatalConditionHandler::oldSigStack = {};
- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
+ stack_t FatalConditionHandler::oldSigStack = {};
+ char FatalConditionHandler::altStackMem[] = {};
#endif // DOCTEST_PLATFORM_WINDOWS
#endif // DOCTEST_CONFIG_POSIX_SIGNALS || DOCTEST_CONFIG_WINDOWS_SEH