From: Andy Isaacson <adi@hexapodia.org>
Date: Fri, 7 May 2010 19:22:44 +0000 (-0700)
Subject: use ssp-buffer-size=1 to avoid Werror failures
X-Git-Tag: tor-0.2.2.14-alpha~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6751899fe1c85ad7fdddc9fea74387098ecab015;p=thirdparty%2Ftor.git

use ssp-buffer-size=1 to avoid Werror failures

Build on Ubuntu 10.04 64-bit was failing:

util.c: In function ‘parse_http_time’:
util.c:1370: error: not protecting function: no buffer at least 8 bytes long

We don't want to lose -Werror, and we don't care too much about the
added overhead of protecting even small buffers, so let's simply turn on
SSP for all buffers.

Thanks to Jacob Appelbaum for the pointer and SwissTorExit for the
original report.

Signed-off-by: Andy Isaacson <adi@hexapodia.org>
---

diff --git a/configure.in b/configure.in
index 07b3ff423b..46c3c1944e 100644
--- a/configure.in
+++ b/configure.in
@@ -885,7 +885,7 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy
     # These warnings break gcc 4.0.2 and work on gcc 4.2
     # XXXX020 Use -fstack-protector.
     # XXXX020 See if any of these work with earlier versions.
-    CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1"
+    CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1 --param ssp-buffer-size=1"
     # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3.
   fi