mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
401413579f
commit
5e161f4266
@@ -1,35 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
+2
-4
@@ -13,12 +13,10 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \
|
|||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
file://fix-run-builtins.patch \
|
file://fix-run-builtins.patch \
|
||||||
file://0001-help-fix-printf-format-security-warning.patch \
|
file://0001-help-fix-printf-format-security-warning.patch \
|
||||||
file://bash-memleak-bug-fix-for-builtin-command-read.patch \
|
|
||||||
file://pathexp-dep.patch \
|
file://pathexp-dep.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[tarball.md5sum] = "7c112970cbdcadfc331e10eeb5f6aa41"
|
SRC_URI[tarball.md5sum] = "518e2c187cc11a17040f0915dddce54e"
|
||||||
SRC_URI[tarball.sha256sum] = "57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331"
|
SRC_URI[tarball.sha256sum] = "604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23"
|
||||||
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "nativesdk"
|
BBCLASSEXTEND = "nativesdk"
|
||||||
Reference in New Issue
Block a user