From 618076c317aa599f456d2bf0f195ffa09bc3313d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 10 Apr 2025 10:42:12 +0200 Subject: [PATCH] vasnprintf: Fix handling of # flag in %b, %B directives. * lib/vasnprintf.c (VASNPRINTF): In the prec_ourselves code, treat a 0b prefix like a 0x prefix. --- ChangeLog | 6 ++++++ lib/vasnprintf.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e9ffa2a48..f039a336e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2025-04-10 Bruno Haible + + vasnprintf: Fix handling of # flag in %b, %B directives. + * lib/vasnprintf.c (VASNPRINTF): In the prec_ourselves code, treat a 0b + prefix like a 0x prefix. + 2025-04-09 Simon Josefsson string-h: Fix build error on Windows/macOS about strerror_l. diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index e7db39c74c..a07c1377dd 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -6876,10 +6876,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, || *prec_ptr == ' ')) prefix_count = 1; /* Put the additional zeroes after the 0x prefix if - (flags & FLAG_ALT) || (dp->conversion == 'p'). */ + (flags & FLAG_ALT) || (dp->conversion == 'p'), or + after the 0b prefix if (flags & FLAG_ALT). */ else if (count >= 2 && prec_ptr[0] == '0' - && (prec_ptr[1] == 'x' || prec_ptr[1] == 'X')) + && (prec_ptr[1] == 'x' || prec_ptr[1] == 'X' + || prec_ptr[1] == 'b' + || prec_ptr[1] == 'B')) prefix_count = 2; move = count - prefix_count; -- 2.39.5