From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id C818E3858D39; Tue, 28 Mar 2023 13:58:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C818E3858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680011933; bh=+2x+6uQ18BwksoRoS+abhNs1N5BrdCUlJminmG9H4cU=; h=From:To:Subject:Date:From; b=vOhFKWG5/zE9nIJcAeWCx1P7iYNuMsE392dOxZTBiNrROQri2PPWkh4aTYcLOaM26 wdtwBrWEJ/dQoZyot6OqEFByL/bYUnuNXIVjIkzMpyYK8Rnhbp9mbD0Ovlj1joE5xJ vZmOiaJtz02KhC7pNz7799XQ4jOcJBsR2XpM2s7k= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] posix: Fix some crashes in wordexp [BZ #18096] X-Act-Checkin: glibc X-Git-Author: Julian Squires X-Git-Refname: refs/heads/master X-Git-Oldrev: 07dd75589ecbedec5162a5645d57f8bd093a45db X-Git-Newrev: 31bfe3ef4ea898df606cb6cc59ac72de27002b01 Message-Id: <20230328135853.C818E3858D39@sourceware.org> Date: Tue, 28 Mar 2023 13:58:53 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=31bfe3ef4ea898df606cb6cc59ac72de27002b01 commit 31bfe3ef4ea898df606cb6cc59ac72de27002b01 Author: Julian Squires Date: Wed Mar 22 14:09:57 2023 -0230 posix: Fix some crashes in wordexp [BZ #18096] Without these fixes, the first three included tests segfault (on a NULL dereference); the fourth aborts on an assertion, which is itself unnecessary. Signed-off-by: Julian Squires Reviewed-by: Adhemerval Zanella Diff: --- posix/wordexp-test.c | 4 ++++ posix/wordexp.c | 11 ++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c index f7a591149b..bae27d6cee 100644 --- a/posix/wordexp-test.c +++ b/posix/wordexp-test.c @@ -117,6 +117,8 @@ struct test_case_struct { 0, NULL, "$((010+0x10))", 0, 1, { "24" }, IFS }, { 0, NULL, "$((-010+0x10))", 0, 1, { "8" }, IFS }, { 0, NULL, "$((-0x10+010))", 0, 1, { "-8" }, IFS }, + { 0, NULL, "$(())", 0, 1, { "0", }, IFS }, + { 0, NULL, "$[]", 0, 1, { "0", }, IFS }, /* Advanced parameter expansion */ { 0, NULL, "${var:-bar}", 0, 1, { "bar", }, IFS }, @@ -138,6 +140,8 @@ struct test_case_struct { 0, "12345", "${#var}", 0, 1, { "5", }, IFS }, { 0, NULL, "${var:-'}'}", 0, 1, { "}", }, IFS }, { 0, NULL, "${var-}", 0, 0, { NULL }, IFS }, + { 0, NULL, "${a?}", 0, 0, { NULL, }, IFS }, + { 0, NULL, "${#a=}", 0, 1, { "0", }, IFS }, { 0, "pizza", "${var#${var}}", 0, 0, { NULL }, IFS }, { 0, "pepperoni", "${var%$(echo oni)}", 0, 1, { "pepper" }, IFS }, diff --git a/posix/wordexp.c b/posix/wordexp.c index 0da98f5b08..b34c4a939b 100644 --- a/posix/wordexp.c +++ b/posix/wordexp.c @@ -720,7 +720,7 @@ parse_arith (char **word, size_t *word_length, size_t *max_length, ++(*offset); /* Go - evaluate. */ - if (*expr && eval_expr (expr, &numresult) != 0) + if (expr && eval_expr (expr, &numresult) != 0) { free (expr); return WRDE_SYNTAX; @@ -758,7 +758,7 @@ parse_arith (char **word, size_t *word_length, size_t *max_length, long int numresult = 0; /* Go - evaluate. */ - if (*expr && eval_expr (expr, &numresult) != 0) + if (expr && eval_expr (expr, &numresult) != 0) { free (expr); return WRDE_SYNTAX; @@ -1790,7 +1790,7 @@ envsubst: { const char *str = pattern; - if (str[0] == '\0') + if (!str || str[0] == '\0') str = _("parameter null or not set"); __fxprintf (NULL, "%s: %s\n", env, str); @@ -1883,10 +1883,7 @@ envsubst: _itoa_word (value ? strlen (value) : 0, ¶m_length[20], 10, 0)); if (free_value) - { - assert (value != NULL); - free (value); - } + free (value); return *word ? 0 : WRDE_NOSPACE; }