From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/10464
Path: news.gmane.org!.POSTED!not-for-mail
From: "Dmitry V. Levin" <ldv@altlinux.org>
Newsgroups: gmane.linux.lib.musl.general
Subject: Re: [PATCH] fix printf regression with alt-form octal, default precision
Date: Thu, 15 Sep 2016 19:04:34 +0300
Message-ID: <20160915160434.GB19101@altlinux.org>
References: <20160804010740.GA12707@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 1473955494 5630 195.159.176.226 (15 Sep 2016 16:04:54 GMT)
X-Complaints-To: usenet@blaine.gmane.org
NNTP-Posting-Date: Thu, 15 Sep 2016 16:04:54 +0000 (UTC)
To: musl@lists.openwall.com
Original-X-From: musl-return-10477-gllmg-musl=m.gmane.org@lists.openwall.com Thu Sep 15 18:04:50 2016
Return-path: <musl-return-10477-gllmg-musl=m.gmane.org@lists.openwall.com>
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 <musl-return-10477-gllmg-musl=m.gmane.org@lists.openwall.com>)
	id 1bkZ9a-0000Wy-O5
	for gllmg-musl@m.gmane.org; Thu, 15 Sep 2016 18:04:46 +0200
Original-Received: (qmail 16223 invoked by uid 550); 15 Sep 2016 16:04:46 -0000
Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm
Precedence: bulk
List-Post: <mailto:musl@lists.openwall.com>
List-Help: <mailto:musl-help@lists.openwall.com>
List-Unsubscribe: <mailto:musl-unsubscribe@lists.openwall.com>
List-Subscribe: <mailto:musl-subscribe@lists.openwall.com>
List-ID: <musl.lists.openwall.com>
Original-Received: (qmail 16199 invoked from network); 15 Sep 2016 16:04:46 -0000
Content-Disposition: inline
In-Reply-To: <20160804010740.GA12707@altlinux.org>
Xref: news.gmane.org gmane.linux.lib.musl.general:10464
Archived-At: <http://permalink.gmane.org/gmane.linux.lib.musl.general/10464>

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<z-a+1) p=z-a+1;
> +			if (fl&ALT_FORM) {
> +				if (p >= 0 && p<z-a+1) {
> +					p=z-a+1;
> +				} else if (arg.i) {
> +					prefix+=5;
> +					pl=1;
> +				}
> +			}
>  			} if (0) {
>  		case 'd': case 'i':
>  			pl=1;
> 
> -- 
> ldv

-- 
ldv