diff options
| author | Sam Bingner <sam@bingner.com> | 2019-05-26 14:03:04 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-05-26 14:03:04 -1000 |
| commit | 73636d0232aca4628b346b11eb07730d9c536147 (patch) | |
| tree | f7729ae9e4477193473ba52d68d352f81e2fc132 /data | |
| parent | 0156e3f6ccb7a2b9534cff680e58447d59b2e8ba (diff) | |
Add gnulib patch to gnulib bundled in m4
https://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html
Diffstat (limited to 'data')
| -rw-r--r-- | data/m4/make.sh | 2 | ||||
| -rw-r--r-- | data/m4/vasnprintf.diff | 45 | ||||
| -rw-r--r-- | data/m4/vasnprintf2.diff | 35 |
3 files changed, 81 insertions, 1 deletions
diff --git a/data/m4/make.sh b/data/m4/make.sh index 452a4bfd5..b78ddd2d2 100644 --- a/data/m4/make.sh +++ b/data/m4/make.sh @@ -1,4 +1,4 @@ pkg:setup pkg:configure -make +pkg:make pkg:install diff --git a/data/m4/vasnprintf.diff b/data/m4/vasnprintf.diff new file mode 100644 index 000000000..697a9b484 --- /dev/null +++ b/data/m4/vasnprintf.diff @@ -0,0 +1,45 @@ +From c41f233c4c38e84023a16339782ee306f03e7f59 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <address@hidden> +Date: Fri, 7 Jul 2017 14:10:20 -0700 +Subject: [PATCH] vasnprintf: port to macOS 10.13 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by comex in: +http://lists.gnu.org/archive/html/bug-gnulib/2017-07/msg00056.html +* lib/vasnprintf.c (VASNPRINTF): Donât use %n on macOS. +--- + ChangeLog | 7 +++++++ + lib/vasnprintf.c | 9 ++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c +index 9c2af0e..fecaf27 100644 +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -4869,7 +4869,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) ++# if ! (((__GLIBC__ > 2 \ ++ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ ++ && !defined __UCLIBC__) \ ++ || (defined __APPLE__ && defined __MACH__) \ ++ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; + fbp[3] = '\0'; +@@ -4883,6 +4887,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + in format strings in writable memory may crash the program + (if compiled with _FORTIFY_SOURCE=2), so we should avoid it + in this situation. */ ++ /* macOS 10.13 High Sierra behaves like glibc with ++ _FORTIFY_SOURCE=2, and older macOS releases ++ presumably do not need %n. */ + /* On native Windows systems (such as mingw), we can avoid using + %n because: + - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, +-- +2.7.4 diff --git a/data/m4/vasnprintf2.diff b/data/m4/vasnprintf2.diff new file mode 100644 index 000000000..54ab5e88a --- /dev/null +++ b/data/m4/vasnprintf2.diff @@ -0,0 +1,35 @@ +diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c +index fecaf27..2e4eb19 100644 +--- a/lib/vasnprintf.c ++++ b/lib/vasnprintf.c +@@ -4869,10 +4869,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + #endif + *fbp = dp->conversion; + #if USE_SNPRINTF +-# if ! (((__GLIBC__ > 2 \ +- || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ +- && !defined __UCLIBC__) \ +- || (defined __APPLE__ && defined __MACH__) \ ++# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ ++ && !defined __UCLIBC__) \ ++ || (defined __APPLE__ && defined __MACH__) \ + || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) + fbp[1] = '%'; + fbp[2] = 'n'; +@@ -4887,9 +4886,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, + in format strings in writable memory may crash the program + (if compiled with _FORTIFY_SOURCE=2), so we should avoid it + in this situation. */ +- /* macOS 10.13 High Sierra behaves like glibc with +- _FORTIFY_SOURCE=2, and older macOS releases +- presumably do not need %n. */ ++ /* On Mac OS X 10.3 or newer, we know that snprintf's return ++ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 ++ and gl_SNPRINTF_TRUNCATION_C99 pass. ++ Therefore we can avoid using %n in this situation. ++ On Mac OS X 10.13 or newer, the use of %n in format strings ++ in writable memory by default crashes the program, so we ++ should avoid it in this situation. */ + /* On native Windows systems (such as mingw), we can avoid using + %n because: + - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, |