From 0c4e743eaf2ab6bcfd56e002fb82f95801b9292e Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Wed, 22 Jan 2014 09:00:27 -0800
Subject: [PATCH] Test and fix malloc_printf("%%").

---
 src/util.c       | 13 ++++++-------
 test/unit/util.c |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/util.c b/src/util.c
index 20062553..93a19fd1 100644
--- a/src/util.c
+++ b/src/util.c
@@ -400,11 +400,6 @@ malloc_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 			unsigned char len = '?';
 
 			f++;
-			if (*f == '%') {
-				/* %% */
-				APPEND_C(*f);
-				break;
-			}
 			/* Flags. */
 			while (true) {
 				switch (*f) {
@@ -495,6 +490,11 @@ malloc_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 			switch (*f) {
 				char *s;
 				size_t slen;
+			case '%':
+				/* %% */
+				APPEND_C(*f);
+				f++;
+				break;
 			case 'd': case 'i': {
 				intmax_t val JEMALLOC_CC_SILENCE_INIT(0);
 				char buf[D2S_BUFSIZE];
@@ -561,8 +561,7 @@ malloc_vsnprintf(char *str, size_t size, const char *format, va_list ap)
 				APPEND_PADDED_S(s, slen, width, left_justify);
 				f++;
 				break;
-			}
-			default: not_reached();
+			} default: not_reached();
 			}
 			break;
 		} default: {
diff --git a/test/unit/util.c b/test/unit/util.c
index 4b4d19da..dc3cfe8a 100644
--- a/test/unit/util.c
+++ b/test/unit/util.c
@@ -181,6 +181,8 @@ TEST_BEGIN(test_malloc_snprintf)
 
 	TEST("hello", "hello");
 
+	TEST("50%, 100%", "50%%, %d%%", 100);
+
 	TEST("a0123b", "a%sb", "0123");
 
 	TEST("a 0123b", "a%5sb", "0123");