From c38410696d3c2a876015a444a1b6cac19bb403ba Mon Sep 17 00:00:00 2001
From: Siteshwar Vashisht <svashisht@redhat.com>
Date: Sep 26 2022 07:31:06 +0000
Subject: Add a null check in parameter_brace_transform() function


Resolves: #2122331

---

diff --git a/bash-5.2-check-xform.patch b/bash-5.2-check-xform.patch
new file mode 100644
index 0000000..c83dc59
--- /dev/null
+++ b/bash-5.2-check-xform.patch
@@ -0,0 +1,12 @@
+diff --git a/subst.c b/subst.c
+--- a/subst.c
++++ b/subst.c
+@@ -7962,7 +7962,7 @@ parameter_brace_transform (varname, value, ind, xform, rtype, quoted, pflags, fl
+       return ((char *)NULL);
+     }
+ 
+-  if (valid_parameter_transform (xform) == 0)
++  if (xform[0] == 0 || valid_parameter_transform (xform) == 0)
+     {
+       this_command_name = oname;
+ #if 0 /* TAG: bash-5.2 Martin Schulte <gnu@schrader-schulte.de> 10/2020 */
diff --git a/bash.spec b/bash.spec
index f458fab..38ce010 100644
--- a/bash.spec
+++ b/bash.spec
@@ -6,7 +6,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 Url: https://www.gnu.org/software/bash
 Source0: https://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz
@@ -87,6 +87,10 @@ Patch127: bash-4.4-no-loadable-builtins.patch
 # This option is undocumented in upstream and is documented by this patch
 Patch128: bash-5.0-syslog-history.patch
 
+# 2122331 - Heap-buffer-overflow in valid_parameter_transform
+# This patch should be removed while rebasing to bash-5.2
+Patch129: bash-5.2-check-xform.patch
+
 BuildRequires:  gcc
 BuildRequires: texinfo bison
 BuildRequires: ncurses-devel
@@ -318,6 +322,10 @@ end
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Sep 26 2022 Siteshwar Vashisht <svashisht@redhat.com> - 5.1.16-4
+- Add a null check in parameter_brace_transform() function
+  Resolves: #2122331
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild