From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/10465 Path: news.gmane.org!.POSTED!not-for-mail From: Rich Felker Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH] fix printf regression with alt-form octal, default precision Date: Thu, 15 Sep 2016 12:22:57 -0400 Message-ID: <20160915162257.GI15995@brightrain.aerifal.cx> References: <20160804010740.GA12707@altlinux.org> <20160915160434.GB19101@altlinux.org> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1473956601 14128 195.159.176.226 (15 Sep 2016 16:23:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 15 Sep 2016 16:23:21 +0000 (UTC) User-Agent: Mutt/1.5.21 (2010-09-15) To: musl@lists.openwall.com Original-X-From: musl-return-10478-gllmg-musl=m.gmane.org@lists.openwall.com Thu Sep 15 18:23:17 2016 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1bkZRP-0002WN-5I for gllmg-musl@m.gmane.org; Thu, 15 Sep 2016 18:23:11 +0200 Original-Received: (qmail 5877 invoked by uid 550); 15 Sep 2016 16:23:11 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 5856 invoked from network); 15 Sep 2016 16:23:10 -0000 Content-Disposition: inline In-Reply-To: <20160915160434.GB19101@altlinux.org> Original-Sender: Rich Felker Xref: news.gmane.org gmane.linux.lib.musl.general:10465 Archived-At: On Thu, Sep 15, 2016 at 07:04:34PM +0300, Dmitry V. Levin wrote: > Ping? > > On Thu, Aug 04, 2016 at 04:07:40AM +0300, Dmitry V. Levin wrote: > > commit v1.1.5-10-gb91cdbe2bc8b626aa04dc6e3e84345accf34e4b1 that fixed > > behavior of printf with alt-form octal, zero precision, zero value, > > at the same time broke alt-form octal with default precision, > > e. g. printf("%#09o", 1). > > --- > > src/stdio/vfprintf.c | 9 ++++++++- > > 1 file changed, 8 insertions(+), 1 deletion(-) > > > > diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c > > index 2ecf769..ac2891c 100644 > > --- a/src/stdio/vfprintf.c > > +++ b/src/stdio/vfprintf.c > > @@ -570,7 +570,14 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, > > if (0) { > > case 'o': > > a = fmt_o(arg.i, z); > > - if ((fl&ALT_FORM) && p > + if (fl&ALT_FORM) { > > + if (p >= 0 && p > + p=z-a+1; > > + } else if (arg.i) { > > + prefix+=5; > > + pl=1; > > + } > > + } This still does not fix all cases, e.g. printf("%#09.0o\n", 0); I'm going to try to understand what's going on and make a complete fix. Rich