From 6db8e4c096def7b0094c449692f37813177d1d9a Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Thu, 23 Jan 2020 12:57:48 +0100 Subject: [PATCH 1/2] Remove 'v' format from spprintf implementation --- main/spprintf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/main/spprintf.c b/main/spprintf.c index 5b1bafccffb4b..50dec7ee939d5 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -587,7 +587,6 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt case 's': - case 'v': s = va_arg(ap, char *); if (s != NULL) { if (!adjust_precision) { From c4434ec61d1a2b30f00e2352f7dc15280f619380 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Thu, 23 Jan 2020 13:00:24 +0100 Subject: [PATCH 2/2] Remove 'I' length modifier from spprintf implementation --- main/spprintf.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/main/spprintf.c b/main/spprintf.c index 50dec7ee939d5..cae2e12c5e44a 100644 --- a/main/spprintf.c +++ b/main/spprintf.c @@ -312,25 +312,6 @@ static void xbuf_format_converter(void *xbuf, zend_bool is_char, const char *fmt fmt++; modifier = LM_LONG_DOUBLE; break; - case 'I': - fmt++; -#if SIZEOF_LONG_LONG - if (*fmt == '6' && *(fmt+1) == '4') { - fmt += 2; - modifier = LM_LONG_LONG; - } else -#endif - if (*fmt == '3' && *(fmt+1) == '2') { - fmt += 2; - modifier = LM_LONG; - } else { -#ifdef _WIN64 - modifier = LM_LONG_LONG; -#else - modifier = LM_LONG; -#endif - } - break; case 'l': fmt++; #if SIZEOF_LONG_LONG