26 lines
1.4 KiB
Diff
26 lines
1.4 KiB
Diff
|
--- a/lib/vasnprintf.c
|
||
|
|
+++ b/lib/vasnprintf.c
|
||
|
|
@@ -4858,7 +4858,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *
|
||
|
|
#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';
|
||
|
|
@@ -4872,6 +4876,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *
|
||
|
|
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,
|