1From 4a332d01186b09a9d46390b845024d914d9149cb Mon Sep 17 00:00:00 2001 2From: Michel Alexandre Salim <michel@michel-slm.name> 3Date: Sun, 21 Mar 2021 13:17:00 -0700 4Subject: [PATCH] Fix for non-constant SIGSTKSZ 5 6On glibc > 2.33, `SIGSTKSZ` might not be constant (in which case 7it expands to a call to `sysconf` which returns a `long int`); see 8http://sourceware-org.1504.n7.nabble.com/PATCH-sysconf-Add-SC-MINSIGSTKSZ-SC-SIGSTKSZ-BZ-20305-td650948.html 9 10Cast the two arguments to `max` to `unsigned`, which is the type of the variable 11we're storing the result in anyway, so that it works both with the old-style constant 12`SIGSTKSZ` and the new configurable one. 13 14Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name> 15Change-Id: I3d87048561a87c6b9fcdbb14b3d53dd45b0a00f0 16 17[Retrieved from: 18https://chromium-review.googlesource.com/c/breakpad/breakpad/+/2776379] 19Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 20--- 21 22diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc 23index ca353c4..3788829 100644 24--- a/src/client/linux/handler/exception_handler.cc 25+++ b/src/client/linux/handler/exception_handler.cc 26@@ -138,7 +138,7 @@ 27 // SIGSTKSZ may be too small to prevent the signal handlers from overrunning 28 // the alternative stack. Ensure that the size of the alternative stack is 29 // large enough. 30- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); 31+ static const unsigned kSigStackSize = std::max((unsigned) 16384, (unsigned) SIGSTKSZ); 32 33 // Only set an alternative stack if there isn't already one, or if the current 34 // one is too small. 35