From aa8ca5625fb8ff6be8a0832697a6e48135a2f49f Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Tue, 21 May 2024 10:45:04 +0200
Subject: [PATCH] Initialize variable to avoid possible uninitialized use

---
 .kbd.metadata                       |  4 ++++
 kbd-2.4.0-initialize-variable.patch | 12 ++++++++++++
 kbd.spec                            |  9 ++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 .kbd.metadata
 create mode 100644 kbd-2.4.0-initialize-variable.patch

diff --git a/.kbd.metadata b/.kbd.metadata
new file mode 100644
index 0000000..c925be6
--- /dev/null
+++ b/.kbd.metadata
@@ -0,0 +1,4 @@
+a5f6d9dff7a8a484cd5014ec7ffdf1eaed27084a kbd-latsun-fonts.tar.bz2
+17db7aaba451796278758e7c6e443b4659af17b9 kbd-latarcyrheb-32.tar.bz2
+8bc79b539e7970560ff69e6c2014b3228fc16e2b kbdinfo.1
+724c030926d125b5e430274e92c4236d8534d410 kbd-2.4.0.tar.xz
diff --git a/kbd-2.4.0-initialize-variable.patch b/kbd-2.4.0-initialize-variable.patch
new file mode 100644
index 0000000..6aa001d
--- /dev/null
+++ b/kbd-2.4.0-initialize-variable.patch
@@ -0,0 +1,12 @@
+diff -up kbd-2.4.0/src/libkfont/setfont.c.orig kbd-2.4.0/src/libkfont/setfont.c
+--- kbd-2.4.0/src/libkfont/setfont.c.orig	2020-06-01 17:53:08.000000000 +0200
++++ kbd-2.4.0/src/libkfont/setfont.c	2024-04-16 11:04:00.455262477 +0200
+@@ -270,7 +270,7 @@ kfont_load_fonts(struct kfont_context *c
+ 	unsigned char *inbuf, *fontbuf, *bigfontbuf;
+ 	unsigned int inputlth, fontbuflth, fontsize, height, width, bytewidth;
+ 	unsigned int bigfontbuflth, bigfontsize, bigheight, bigwidth;
+-	unsigned char *ptr;
++	unsigned char *ptr = NULL;
+ 	struct unicode_list *uclistheads;
+ 	struct kbdfile *fp = NULL;
+ 	int i;
diff --git a/kbd.spec b/kbd.spec
index 4396437..0c3c245 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -5,7 +5,7 @@
 
 Name:           kbd
 Version:        2.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 License:        GPLv2+
 URL:            http://www.kbd-project.org/
@@ -38,6 +38,8 @@ Patch7:         kbd-2.0.4-covscan-fixes.patch
 Patch8:         kbd-2.4.0-covscan-fixes.patch
 # Patch9: fixes setfont exit code, bz 1947953
 Patch9:         kbd-2.4.0-setfont-exit-code.patch
+# Patch10: initializes variable (SAST)
+Patch10:        kbd-2.4.0-initialize-variable.patch
 
 BuildRequires:  gcc, bison, flex, gettext, pam-devel, check-devel, automake
 BuildRequires:  console-setup, xkeyboard-config
@@ -85,6 +87,7 @@ cp -fp %{SOURCE6} .
 %patch7 -p1 -b .covscan-fixes
 %patch8 -p1 -b .covscan-fixes-pt2
 %patch9 -p1 -b .setfont-exit-code
+%patch10 -p1 -b .initialize-variable
 aclocal
 autoconf
 
@@ -197,6 +200,10 @@ make check
 %{kbd_datadir}/keymaps/legacy
 
 %changelog
+* Tue May 21 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-10
+- Initialize variable to avoid possible uninitialized use
+  Resolves: RHEL-31795
+
 * Mon Apr 17 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-9
 - Require kbd-legacy in main kbd package again
   Resolves: #2139165