diff options
| author |   Zhang Xiao <xiao.zhang@windriver.com> | 2017-08-25 08:42:38 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-11 22:15:51 +0100 |
| commit | 571e53024b4f924e50cf6a478ccc8d6f097816bb (patch) | |
| tree | d0996d05c1b950a910fdc61a88a7aff3585b40d3 | |
| parent | 1c9d891886f35e6cc4485f244180d7d0ffa82cd3 (diff) | |
| download | openembedded-core-contrib-571e53024b4f924e50cf6a478ccc8d6f097816bb.tar.gz | |
bash: memleak bug fix for builtin command read
Built in command "read" with "-e" use Readline to obtain the line
in an interactive shell. In this process, a string "rlbuf" is
just allocated without free operation thus cause memory leak.
This patch had been submitted to upstream:
http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00061.html
(From OE-Core rev: a2b278a6eaa9e9b48d858e3be6712267c0122598)
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
fixup for 4.3
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-extended/bash/bash_4.3.30.bb | 1 |
2 files changed, 36 insertions, 0 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 new file mode 100644 index 0000000000..9fb6ba972b --- /dev/null +++ b/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch @@ -0,0 +1,35 @@ +From d3b6303a6853f612a56848ee4e59eaa0b0ab9489 Mon Sep 17 00:00:00 2001 +From: Zhang Xiao <xiao.zhang@windriver.com> +Date: Tue, 21 Feb 2017 11:30:14 +0800 +Subject: [PATCH] bash: memleak bug fix for builtin command read + +Built in command "read" with "-e" use Readline to obtain the line +in an interactive shell. In this process, a string "rlbuf" is +just allocated without free operation thus cause memory leak. Fix it. + +Upstream-Status: Submitted [http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00061.html] + +Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> +--- + builtins/read.def | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/builtins/read.def b/builtins/read.def +index 4397154..ee0c5a6 100644 +--- a/builtins/read.def ++++ b/builtins/read.def +@@ -674,6 +674,11 @@ add_char: + input_string[i] = '\0'; + CHECK_ALRM; + ++#if defined (READLINE) ++ if (edit) ++ xfree (rlbuf); ++#endif ++ + if (retval < 0) + { + t_errno = errno; +-- +1.9.1 + diff --git a/meta/recipes-extended/bash/bash_4.3.30.bb b/meta/recipes-extended/bash/bash_4.3.30.bb index b40059fa1d..2648faf471 100644 --- a/meta/recipes-extended/bash/bash_4.3.30.bb +++ b/meta/recipes-extended/bash/bash_4.3.30.bb @@ -32,6 +32,7 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ file://0001-help-fix-printf-format-security-warning.patch \ file://fix-run-intl.patch \ file://CVE-2016-9401.patch \ + file://bash-memleak-bug-fix-for-builtin-command-read.patch \ " SRC_URI[tarball.md5sum] = "a27b3ee9be83bd3ba448c0ff52b28447" |