rpms/bash
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import bash-4.4.20-2.el8

Browse Source
This commit is contained in:
CentOS Sources 2021-11-09 05:09:26 -05:00 committed by Stepan Oksanichenko
parent 9eaf795c44
commit ce4791222d
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SOURCES/bash-5.0-histtimeformat-segfault.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/builtins/history.def b/builtins/history.def
--- a/builtins/history.def
+++ b/builtins/history.def
@@ -256,10 +256,13 @@ histtime (hlist, histtimefmt)
{
static char timestr[128];
time_t t;
+ struct tm *tm;
t = history_get_time (hlist);
- if (t)
- strftime (timestr, sizeof (timestr), histtimefmt, localtime (&t));
+
+ tm = t ? localtime (&t) : 0;
+ if (t && tm)
+ strftime (timestr, sizeof (timestr), histtimefmt, tm);
else if (hlist->timestamp && hlist->timestamp[0])
snprintf (timestr, sizeof (timestr), _("%s: invalid timestamp"),
(hlist->timestamp[0] == '#') ? hlist->timestamp + 1: hlist->timestamp);

9
SPECS/bash.spec
View File

@ -7,7 +7,7 @@
Version: %{baseversion}%{patchleveltag} Version: %{baseversion}%{patchleveltag}
Name: bash Name: bash
Summary: The GNU Bourne Again shell Summary: The GNU Bourne Again shell
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Url: https://www.gnu.org/software/bash Url: https://www.gnu.org/software/bash
Source0: https://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz Source0: https://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz
@ -112,6 +112,9 @@ Patch136: bash-5.0-cve-2019-18276-2.patch
# values # values
Patch137: bash-5.0-bgp-resize.patch Patch137: bash-5.0-bgp-resize.patch
# 1794884 - HISTTIMEFORMAT causes Segmentation fault under certain conditions
Patch138: bash-5.0-histtimeformat-segfault.patch
BuildRequires: texinfo bison BuildRequires: texinfo bison
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: autoconf, gettext BuildRequires: autoconf, gettext
@ -335,6 +338,10 @@ end
%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%changelog %changelog
* Mon Jul 26 2021 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.20-2
- Fix crash if a timestamp in a history file overflowed a time_t
Resolves: #1794884
* Fri Mar 26 2021 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.20-1 * Fri Mar 26 2021 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.20-1
- Fix infinite loop in long running scripts - Fix infinite loop in long running scripts
Resolves: #1943495 Resolves: #1943495