summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base__strings__safe_sprintf.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-03-11 21:53:39 +0000
committerRene Ladan <rene@FreeBSD.org>2014-03-11 21:53:39 +0000
commitb74555ba4f0246a3e284acd09a5d56535276d541 (patch)
tree9f33ba280c0d0645626e82de064d8080fbefbb54 /www/chromium/files/patch-base__strings__safe_sprintf.cc
parentMove {mail,japanese}/p5-Mail-SpamAssassin to &/spamassassin, in the name of (diff)
- Update to 33.0.1750.149 [1]
- Add a patch to fix build on FreeBSD < 10 [2] Obtained from: http://crbug.com/347123 [2] Security: http://vuxml.org/freebsd/24cefa4b-a940-11e3-91f2-00262d5ed8ee.html [1] MFH: 2014Q1
Diffstat (limited to 'www/chromium/files/patch-base__strings__safe_sprintf.cc')
-rw-r--r--www/chromium/files/patch-base__strings__safe_sprintf.cc19
1 files changed, 19 insertions, 0 deletions
diff --git a/www/chromium/files/patch-base__strings__safe_sprintf.cc b/www/chromium/files/patch-base__strings__safe_sprintf.cc
new file mode 100644
index 000000000000..023027f05962
--- /dev/null
+++ b/www/chromium/files/patch-base__strings__safe_sprintf.cc
@@ -0,0 +1,19 @@
+--- ./base/strings/safe_sprintf.cc.orig 2014-03-04 03:16:26.000000000 +0100
++++ ./base/strings/safe_sprintf.cc 2014-03-07 14:14:55.000000000 +0100
+@@ -107,11 +107,11 @@
+ : buffer_(buffer),
+ size_(size - 1), // Account for trailing NUL byte
+ count_(0) {
+-// The following assertion does not build on Mac and Android. This is because
+-// static_assert only works with compile-time constants, but mac uses
+-// libstdc++4.2 and android uses stlport, which both don't mark
+-// numeric_limits::max() as constexp.
+-#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS)
++// The following assertion does not build on Mac and Android and older FreeBSD.
++// This is because static_assert only works with compile-time constants, but
++// mac and FreeBSD < 10 use libstdc++4.2 and android uses stlport, which both
++// don't mark numeric_limits::max() as constexp.
++#if __cplusplus >= 201103 && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS) && !(defined(OS_FREEBSD) && __FreeBSD_version > 1000054)
+ COMPILE_ASSERT(kSSizeMaxConst == \
+ static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
+ kSSizeMax_is_the_max_value_of_an_ssize_t);