summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-03-30 02:46:29 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:01 +0100
commit5e161f426676ade20a213b07c1fd69a8c3cf5ece (patch)
tree97462d8045e4c689c5186594dd43f20d53e126b5
parent401413579f55da757b97831475f9db4dfb64b232 (diff)
downloadpoky-5e161f426676ade20a213b07c1fd69a8c3cf5ece.tar.gz
bash: 4.4.12 -> 4.4.18
- Drop bash-memleak-bug-fix-for-builtin-command-read.patch which has been accepted since 4.4.17 (From OE-Core rev: ec6da604012b54769db3371a8ed9ac0be4c9d0e6) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch35
-rw-r--r--meta/recipes-extended/bash/bash_4.4.18.bb (renamed from meta/recipes-extended/bash/bash_4.4.12.bb)6
2 files changed, 2 insertions, 39 deletions
diff --git a/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch b/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch
deleted file mode 100644
index 9fb6ba972b..0000000000
--- a/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From d3b6303a6853f612a56848ee4e59eaa0b0ab9489 Mon Sep 17 00:00:00 2001
2From: Zhang Xiao <xiao.zhang@windriver.com>
3Date: Tue, 21 Feb 2017 11:30:14 +0800
4Subject: [PATCH] bash: memleak bug fix for builtin command read
5
6Built in command "read" with "-e" use Readline to obtain the line
7in an interactive shell. In this process, a string "rlbuf" is
8just allocated without free operation thus cause memory leak. Fix it.
9
10Upstream-Status: Submitted [http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00061.html]
11
12Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
13---
14 builtins/read.def | 5 +++++
15 1 file changed, 5 insertions(+)
16
17diff --git a/builtins/read.def b/builtins/read.def
18index 4397154..ee0c5a6 100644
19--- a/builtins/read.def
20+++ b/builtins/read.def
21@@ -674,6 +674,11 @@ add_char:
22 input_string[i] = '\0';
23 CHECK_ALRM;
24
25+#if defined (READLINE)
26+ if (edit)
27+ xfree (rlbuf);
28+#endif
29+
30 if (retval < 0)
31 {
32 t_errno = errno;
33--
341.9.1
35
diff --git a/meta/recipes-extended/bash/bash_4.4.12.bb b/meta/recipes-extended/bash/bash_4.4.18.bb
index 9382a77af6..0b22ca7a69 100644
--- a/meta/recipes-extended/bash/bash_4.4.12.bb
+++ b/meta/recipes-extended/bash/bash_4.4.18.bb
@@ -13,12 +13,10 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
13 file://run-ptest \ 13 file://run-ptest \
14 file://fix-run-builtins.patch \ 14 file://fix-run-builtins.patch \
15 file://0001-help-fix-printf-format-security-warning.patch \ 15 file://0001-help-fix-printf-format-security-warning.patch \
16 file://bash-memleak-bug-fix-for-builtin-command-read.patch \
17 file://pathexp-dep.patch \ 16 file://pathexp-dep.patch \
18 " 17 "
19 18
20SRC_URI[tarball.md5sum] = "7c112970cbdcadfc331e10eeb5f6aa41" 19SRC_URI[tarball.md5sum] = "518e2c187cc11a17040f0915dddce54e"
21SRC_URI[tarball.sha256sum] = "57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331" 20SRC_URI[tarball.sha256sum] = "604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23"
22
23 21
24BBCLASSEXTEND = "nativesdk" 22BBCLASSEXTEND = "nativesdk"