dash.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] [BUILTIN] Reject malformed printf specifications with digits after '*'
@ 2015-12-06 14:09 Gioele Barabucci
  2016-06-06 10:41 ` builtin: " Herbert Xu
  0 siblings, 1 reply; 2+ messages in thread
From: Gioele Barabucci @ 2015-12-06 14:09 UTC (permalink / raw)
  To: dash

[-- Attachment #1: Type: text/plain, Size: 397 bytes --]

Hello,

I am forwarding a patch related to the bug described at
<https://bugs.debian.org/779618>.

You can find the same patch at
<https://github.com/gioele/dash/commit/ebdd2d7992c4b2bf49d9af2eed33e3c18c86dfc6>.

I refreshed the patch to be compatible with the current code, but left
the original author as the git author. I hope this is fine.

Regards,

--
Gioele Barabucci <gioele@svario.it>




[-- Attachment #2: 0001-BUILTIN-Reject-malformed-printf-specifications-with-.patch --]
[-- Type: text/x-patch, Size: 1581 bytes --]

From ebdd2d7992c4b2bf49d9af2eed33e3c18c86dfc6 Mon Sep 17 00:00:00 2001
From: Patrick Brown <opensource@whoopdedo.org>
Date: Mon, 2 Mar 2015 23:10:09 -0500
Subject: [PATCH] [BUILTIN] Reject malformed printf specifications with digits
 after '*'

Dash doesn't notice when a format string has digits following a * width
specifier.

    $ dash -c 'printf "%*0s  " 1 2 && echo FAIL || echo OK'
    %10s  FAIL

    $ bash -c 'printf "%*0s  " 1 2 && echo FAIL || echo OK'
    bash: line 0: printf: `0': invalid format character
    OK
    $ mksh -c 'printf "%*0s  " 1 2 && echo FAIL || echo OK'
    printf: %*0: invalid conversion specification
    OK

With this patch dash complains about the malformed specifications.

    $ ./src/dash -c 'printf "%*0s  " 1 2 && echo FAIL || echo OK'
    ./src/dash: 1: printf: %*0: invalid directive
    OK

Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779618

Originally-by: Patrick Brown <opensource@whoopdedo.org>
Forwarded-by: Gioele Barabucci <gioele@svario.it>
---
 src/bltin/printf.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/bltin/printf.c b/src/bltin/printf.c
index 9673e10..83077a7 100644
--- a/src/bltin/printf.c
+++ b/src/bltin/printf.c
@@ -175,17 +175,20 @@ pc:
 
 			/* skip to field width */
 			fmt += strspn(fmt, SKIP1);
-			if (*fmt == '*')
+			if (*fmt == '*') {
 				*param++ = getuintmax(1);
-
-			/* skip to possible '.', get following precision */
-			fmt += strspn(fmt, SKIP2);
-			if (*fmt == '.')
 				++fmt;
-			if (*fmt == '*')
-				*param++ = getuintmax(1);

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: builtin: Reject malformed printf specifications with digits after '*'
  2015-12-06 14:09 [PATCH] [BUILTIN] Reject malformed printf specifications with digits after '*' Gioele Barabucci
@ 2016-06-06 10:41 ` Herbert Xu
  0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2016-06-06 10:41 UTC (permalink / raw)
  To: Gioele Barabucci; +Cc: dash

On Sun, Dec 06, 2015 at 03:09:42PM +0100, Gioele Barabucci wrote:
> Hello,
> 
> I am forwarding a patch related to the bug described at
> <https://bugs.debian.org/779618>.
> 
> You can find the same patch at
> <https://github.com/gioele/dash/commit/ebdd2d7992c4b2bf49d9af2eed33e3c18c86dfc6>.
> 
> I refreshed the patch to be compatible with the current code, but left
> the original author as the git author. I hope this is fine.

Patch applied with formatting fix-ups.

Thanks,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-06-06 10:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-06 14:09 [PATCH] [BUILTIN] Reject malformed printf specifications with digits after '*' Gioele Barabucci
2016-06-06 10:41 ` builtin: " Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).