| From 66a2b6e4ba8e2b49115043127ce4aa0fcd71ad1e Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Tue, 11 May 2021 11:12:35 -0700 |
| Subject: [PATCH] exception_handler.cc: Match the types for SIGSTKSZ |
| |
| In glibc 2.34, SIGSTKSZ is a syscall which returns a long int, therefore |
| current check fails |
| |
| | ../git/src/client/linux/handler/exception_handler.cc:141:49: error: no matching function for call to 'max(int, long int)' |
| | 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); |
| | | ~~~~~~~~^~~~~~~~~~~~~~~~~ |
| |
| Upstream-Status: Pending |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| src/client/linux/handler/exception_handler.cc | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc |
| index ca353c40..dc0fc4a9 100644 |
| --- a/src/client/linux/handler/exception_handler.cc |
| +++ b/src/client/linux/handler/exception_handler.cc |
| @@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { |
| // SIGSTKSZ may be too small to prevent the signal handlers from overrunning |
| // the alternative stack. Ensure that the size of the alternative stack is |
| // large enough. |
| - static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); |
| + static const unsigned kSigStackSize = std::max(16384u, (unsigned)SIGSTKSZ); |
| |
| // Only set an alternative stack if there isn't already one, or if the current |
| // one is too small. |
| -- |
| 2.31.1 |
| |