Browse code
bash: Fix segfault in save_bash_input.
YustasSwamp authored on 2015/07/22 16:45:37Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Bourne-Again SHell |
| 2 | 2 |
Name: bash |
| 3 | 3 |
Version: 4.3 |
| 4 |
-Release: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: GPLv3 |
| 6 | 6 |
URL: http://www.gnu.org/software/bash/ |
| 7 | 7 |
Group: System Environment/Base |
| ... | ... |
@@ -10,6 +10,7 @@ Distribution: Photon |
| 10 | 10 |
Source0: http://ftp.gnu.org/gnu/bash/%{name}-%{version}.tar.gz
|
| 11 | 11 |
%define sha1 bash=45ac3c5727e7262334f4dfadecdf601b39434e84 |
| 12 | 12 |
Patch0: http://www.linuxfromscratch.org/patches/downloads/bash/bash-4.3-upstream_fixes-7.patch |
| 13 |
+Patch1: fix-save_bash_input-segfault.patch |
|
| 13 | 14 |
Provides: /bin/sh |
| 14 | 15 |
Provides: /bin/bash |
| 15 | 16 |
%description |
| ... | ... |
@@ -25,6 +26,7 @@ These are the additional language files of bash. |
| 25 | 25 |
%prep |
| 26 | 26 |
%setup -q |
| 27 | 27 |
%patch0 -p1 |
| 28 |
+%patch1 -p1 |
|
| 28 | 29 |
%build |
| 29 | 30 |
./configure \ |
| 30 | 31 |
--prefix=%{_prefix} \
|
| ... | ... |
@@ -230,6 +232,8 @@ test -e /root/.bash_logout || cp /etc/skel/.bash_logout /root |
| 230 | 230 |
%defattr(-,root,root) |
| 231 | 231 |
|
| 232 | 232 |
%changelog |
| 233 |
+* Wed Jul 22 2015 Alexey Makhalov <amakhalov@vmware.com> 4.3-3 |
|
| 234 |
+- Fix segfault in save_bash_input. |
|
| 233 | 235 |
* Tue Jun 30 2015 Alexey Makhalov <amakhalov@vmware.com> 4.3-2 |
| 234 | 236 |
- /etc/profile.d permission fix. Pack /etc files into rpm |
| 235 | 237 |
* Wed Oct 22 2014 Divya Thaluru <dthaluru@vmware.com> 4.3-1 |
| 236 | 238 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,12 @@ |
| 0 |
+diff -Naur bash-4.3_old/input.c bash-4.3/input.c |
|
| 1 |
+--- bash-4.3_old/input.c 2014-02-07 14:13:08.000000000 +0000 |
|
| 2 |
+@@ -272,7 +272,7 @@ |
|
| 3 |
+ return -1; |
|
| 4 |
+ } |
|
| 5 |
+ |
|
| 6 |
+- if (buffers[nfd]) |
|
| 7 |
++ if (nfd < nbuffers && buffers[nfd]) |
|
| 8 |
+ {
|
|
| 9 |
+ /* What's this? A stray buffer without an associated open file |
|
| 10 |
+ descriptor? Free up the buffer and report the error. */ |