* [PATCH] wordexp: handle overflow in positional parameter number (bug 28011)
@ 2021-06-25 14:33 Andreas Schwab
2021-06-27 15:41 ` Florian Weimer
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Schwab @ 2021-06-25 14:33 UTC (permalink / raw)
To: libc-alpha
Use strtoul instead of atoi so that overflow can be detected.
---
posix/wordexp-test.c | 1 +
posix/wordexp.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
index f93a546d7e..9df02dbbb3 100644
--- a/posix/wordexp-test.c
+++ b/posix/wordexp-test.c
@@ -183,6 +183,7 @@ struct test_case_struct
{ 0, NULL, "$var", 0, 0, { NULL, }, IFS },
{ 0, NULL, "\"\\n\"", 0, 1, { "\\n", }, IFS },
{ 0, NULL, "", 0, 0, { NULL, }, IFS },
+ { 0, NULL, "${1234567890123456789012}", 0, 0, { NULL, }, IFS },
/* Flags not already covered (testit() has special handling for these) */
{ 0, NULL, "one two", WRDE_DOOFFS, 2, { "one", "two", }, IFS },
diff --git a/posix/wordexp.c b/posix/wordexp.c
index bcbe96e48d..1f3b09f721 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -1399,7 +1399,7 @@ envsubst:
/* Is it a numeric parameter? */
else if (isdigit (env[0]))
{
- int n = atoi (env);
+ unsigned long n = strtoul (env, NULL, 10);
if (n >= __libc_argc)
/* Substitute NULL. */
--
2.32.0
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] wordexp: handle overflow in positional parameter number (bug 28011)
2021-06-25 14:33 [PATCH] wordexp: handle overflow in positional parameter number (bug 28011) Andreas Schwab
@ 2021-06-27 15:41 ` Florian Weimer
2021-06-27 17:08 ` Andreas Schwab
0 siblings, 1 reply; 3+ messages in thread
From: Florian Weimer @ 2021-06-27 15:41 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-alpha
* Andreas Schwab:
> Use strtoul instead of atoi so that overflow can be detected.
> ---
> posix/wordexp-test.c | 1 +
> posix/wordexp.c | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
> index f93a546d7e..9df02dbbb3 100644
> --- a/posix/wordexp-test.c
> +++ b/posix/wordexp-test.c
> @@ -183,6 +183,7 @@ struct test_case_struct
> { 0, NULL, "$var", 0, 0, { NULL, }, IFS },
> { 0, NULL, "\"\\n\"", 0, 1, { "\\n", }, IFS },
> { 0, NULL, "", 0, 0, { NULL, }, IFS },
> + { 0, NULL, "${1234567890123456789012}", 0, 0, { NULL, }, IFS },
>
> /* Flags not already covered (testit() has special handling for these) */
> { 0, NULL, "one two", WRDE_DOOFFS, 2, { "one", "two", }, IFS },
> diff --git a/posix/wordexp.c b/posix/wordexp.c
> index bcbe96e48d..1f3b09f721 100644
> --- a/posix/wordexp.c
> +++ b/posix/wordexp.c
> @@ -1399,7 +1399,7 @@ envsubst:
> /* Is it a numeric parameter? */
> else if (isdigit (env[0]))
> {
> - int n = atoi (env);
> + unsigned long n = strtoul (env, NULL, 10);
>
> if (n >= __libc_argc)
> /* Substitute NULL. */
Looks reasonable. The issue is that n as computed happens to be
negative, right?
Thanks,
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] wordexp: handle overflow in positional parameter number (bug 28011)
2021-06-27 15:41 ` Florian Weimer
@ 2021-06-27 17:08 ` Andreas Schwab
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Schwab @ 2021-06-27 17:08 UTC (permalink / raw)
To: Florian Weimer; +Cc: libc-alpha
On Jun 27 2021, Florian Weimer wrote:
> Looks reasonable. The issue is that n as computed happens to be
> negative, right?
Yes.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-27 17:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-25 14:33 [PATCH] wordexp: handle overflow in positional parameter number (bug 28011) Andreas Schwab
2021-06-27 15:41 ` Florian Weimer
2021-06-27 17:08 ` Andreas Schwab
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 read-only IMAP folder(s) and NNTP newsgroup(s).