diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-03-30 02:46:29 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 13:28:01 +0100 |
commit | 5e161f426676ade20a213b07c1fd69a8c3cf5ece (patch) | |
tree | 97462d8045e4c689c5186594dd43f20d53e126b5 /meta/recipes-extended/bash/bash | |
parent | 401413579f55da757b97831475f9db4dfb64b232 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-extended/bash/bash')
-rw-r--r-- | meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch | 35 |
1 files changed, 0 insertions, 35 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 @@ | |||
1 | From d3b6303a6853f612a56848ee4e59eaa0b0ab9489 Mon Sep 17 00:00:00 2001 | ||
2 | From: Zhang Xiao <xiao.zhang@windriver.com> | ||
3 | Date: Tue, 21 Feb 2017 11:30:14 +0800 | ||
4 | Subject: [PATCH] bash: memleak bug fix for builtin command read | ||
5 | |||
6 | Built in command "read" with "-e" use Readline to obtain the line | ||
7 | in an interactive shell. In this process, a string "rlbuf" is | ||
8 | just allocated without free operation thus cause memory leak. Fix it. | ||
9 | |||
10 | Upstream-Status: Submitted [http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00061.html] | ||
11 | |||
12 | Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> | ||
13 | --- | ||
14 | builtins/read.def | 5 +++++ | ||
15 | 1 file changed, 5 insertions(+) | ||
16 | |||
17 | diff --git a/builtins/read.def b/builtins/read.def | ||
18 | index 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 | -- | ||
34 | 1.9.1 | ||
35 | |||