!143 fix for a crash if one of the expressions in an arithmetic for command expands to NULL
From: @xiao-zai-kylinos Reviewed-by: @dillon_chen Signed-off-by: @dillon_chen
This commit is contained in:
commit
717f584130
26
Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch
Normal file
26
Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 708cc7f694738c6dde2dbb5317749a5a9e6d26e2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=E8=82=96=E5=9C=A8?= <xiaozai@kylinos.cn>
|
||||
Date: Wed, 8 May 2024 17:04:43 +0800
|
||||
Subject: [PATCH] fix for a crash if one of the expressions in an arithmetic
|
||||
for command expands to NULL
|
||||
|
||||
---
|
||||
execute_cmd.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/execute_cmd.c b/execute_cmd.c
|
||||
index ce221a2..46b671d 100644
|
||||
--- a/execute_cmd.c
|
||||
+++ b/execute_cmd.c
|
||||
@@ -3056,7 +3056,7 @@ eval_arith_for_expr (l, okp)
|
||||
temp = expand_arith_string (expr, Q_DOUBLE_QUOTES|Q_ARITH);
|
||||
if (l->next)
|
||||
free (expr);
|
||||
- new = make_word_list (make_word (temp), (WORD_LIST *)NULL);
|
||||
+ new = make_word_list (make_word (temp ? temp : ""), (WORD_LIST *)NULL);
|
||||
free (temp);
|
||||
|
||||
if (new)
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: bash
|
||||
Version: 5.2.15
|
||||
Release: 8
|
||||
Release: 9
|
||||
Summary: It is the Bourne Again Shell
|
||||
License: GPLv3
|
||||
URL: https://www.gnu.org/software/bash
|
||||
@ -33,6 +33,7 @@ Patch6005: backport-fixes-for-LINENO-in-multi-line-simple-commands-print.patch
|
||||
Patch6006: backport-changes-to-SIGINT-handler-while-waiting-for-a-child-.patch
|
||||
Patch6007: backport-renamed-several-functions-beginning-with-legal_-chan.patch
|
||||
Patch6008: backport-fix-for-cd-when-curent-directory-doesn-t-exist-fix-w.patch
|
||||
Patch6009: Fix-for-a-crash-if-one-of-the-expressions-in-an-arit.patch
|
||||
|
||||
BuildRequires: gcc bison texinfo autoconf ncurses-devel
|
||||
# Required for bash tests
|
||||
@ -161,6 +162,9 @@ make check
|
||||
%exclude %{_infodir}/dir
|
||||
|
||||
%changelog
|
||||
* Wed May 08 2024 xiaozai <xiaozai@kylinos.cn> -5.2.15-9
|
||||
- fix for a crash if one of the expressions in an arithmetic for command expands to NULL
|
||||
|
||||
* Fri Apr 26 2024 wangyuhang <wangyuhang27@huawei.com> -5.2.15-8
|
||||
- sync patches from bash community
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user