From 4a3f611b0cac14c482e3d15d6249c168f01d252b Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Tue, 30 Jun 2015 11:55:54 +0200 Subject: [PATCH] Fix a leak introduced by plevel39 --- bash-4.3-memleak.patch | 15 +++++++++++++++ bash.spec | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 bash-4.3-memleak.patch diff --git a/bash-4.3-memleak.patch b/bash-4.3-memleak.patch new file mode 100644 index 0000000..671d2eb --- /dev/null +++ b/bash-4.3-memleak.patch @@ -0,0 +1,15 @@ +*** ../bash-4.3-patched/subst.c 2014-10-01 12:57:47.000000000 -0400 +--- subst.c 2015-06-22 09:16:53.000000000 -0400 +*************** +*** 5783,5787 **** + if (pflags & PF_ASSIGNRHS) + { +! temp = array_variable_name (name, &tt, (int *)0); + if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']') + temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind); +--- 5783,5787 ---- + if (pflags & PF_ASSIGNRHS) + { +! var = array_variable_part (name, &tt, (int *)0); + if (ALL_ELEMENT_SUB (tt[0]) && tt[1] == ']') + temp = array_value (name, quoted|Q_DOUBLE_QUOTES, 0, &atype, &ind); diff --git a/bash.spec b/bash.spec index 7bb0cb3..47ca096 100644 --- a/bash.spec +++ b/bash.spec @@ -8,7 +8,7 @@ Version: %{baseversion}%{patchleveltag} Name: bash Summary: The GNU Bourne Again shell -Release: 3%{?dist} +Release: 4%{?dist} Group: System Environment/Shells License: GPLv3+ Url: http://www.gnu.org/software/bash @@ -128,6 +128,9 @@ Patch134: bash-4.3-pathexp-globignore-delim.patch # 1102815 - fix double echoes in vi visual mode Patch135: bash-4.3-noecho.patch +# 1224855 - memleak in 4.3.39 +Patch136: bash-4.3-memleak.patch + BuildRequires: texinfo bison BuildRequires: ncurses-devel BuildRequires: autoconf, gettext @@ -223,6 +226,7 @@ This package contains documentation files for %{name}. #%patch131 -p0 -b .keyword %patch134 -p0 -b .delim %patch135 -p1 -b .noecho +%patch136 -p0 -b .memleak echo %{version} > _distribution echo %{release} > _patchlevel @@ -421,6 +425,9 @@ end %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Tue Jun 30 2015 Ondrej Oprala - 4.3.39-4 +- Fix a leak introduced by plevel39 + * Tue Jun 30 2015 Ondrej Oprala - 4.3.39-3 - Fix --rpm-requires