Add a patch for a buffer too small to hold a 64-bit printf'd pointer

3 files changed, 19 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14f20527415b..71a952c11835 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tuxracer
 	pkgdesc = The Tux racing game - original version
 	pkgver = 0.61
-	pkgrel = 1
+	pkgrel = 2
 	url = http://tuxracer.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -21,12 +21,14 @@ pkgbase = tuxracer
 	source = http://download.sourceforge.net/tuxracer/tuxracer-0.61.tar.gz
 	source = http://download.sourceforge.net/tuxracer/tuxracer-data-0.61.tar.gz
 	source = invalid-preprocessing-token.diff
+	source = pointer-printf-overflow.diff
 	source = tuxracer.xpm
 	source = tuxracer.desktop
 	source = tuxracer.install
 	sha256sums = a311d09080598fe556134d4b9faed7dc0c2ed956ebb10d062e5d4df022f91eff
 	sha256sums = 3783d204b7bb1ed16aa5e5a1d5944de10fbee05bc7cebb8f616fce84301f3651
 	sha256sums = 6b0ec990d678f2b70f6719d00ec801137f36a842060bfe61409acf20f7cafe73
+	sha256sums = 4a1eb831016211e76d770a3f13bf04f034c78ef65a13427c8004f641300a95f2
 	sha256sums = fb4ddee30cabe0c49f9b63a91abde762847b0a994fc6ae82ad84eb88a5f9f155
 	sha256sums = bf1ac9b1cb6eb2642ab10dcb42f3f73eab4a7e675e7fee1f176f6a462da5ed40
 	sha256sums = 51c656197322833ee3140d71452d31e3258e4bdbeabadc6588562150077281e4
diff --git a/PKGBUILD b/PKGBUILD
index 8883f9ec2e47..878a1e4624f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Kamil Kozar <dkk089@gmail.com>
 pkgname=tuxracer
 pkgver=0.61
-pkgrel=1
+pkgrel=2
 pkgdesc="The Tux racing game - original version"
 arch=('i686' 'x86_64')
 url="http://tuxracer.sourceforge.net/"
@@ -12,6 +12,7 @@ source=(
   "http://download.sourceforge.net/tuxracer/${pkgname}-${pkgver}.tar.gz"
   "http://download.sourceforge.net/tuxracer/${pkgname}-data-${pkgver}.tar.gz"
   'invalid-preprocessing-token.diff'
+  'pointer-printf-overflow.diff'
   'tuxracer.xpm'
   'tuxracer.desktop'
   'tuxracer.install'
@@ -21,6 +22,7 @@ sha256sums=(
   'a311d09080598fe556134d4b9faed7dc0c2ed956ebb10d062e5d4df022f91eff'
   '3783d204b7bb1ed16aa5e5a1d5944de10fbee05bc7cebb8f616fce84301f3651'
   '6b0ec990d678f2b70f6719d00ec801137f36a842060bfe61409acf20f7cafe73'
+  '4a1eb831016211e76d770a3f13bf04f034c78ef65a13427c8004f641300a95f2'
   'fb4ddee30cabe0c49f9b63a91abde762847b0a994fc6ae82ad84eb88a5f9f155'
   'bf1ac9b1cb6eb2642ab10dcb42f3f73eab4a7e675e7fee1f176f6a462da5ed40'
   '51c656197322833ee3140d71452d31e3258e4bdbeabadc6588562150077281e4'
@@ -29,6 +31,7 @@ sha256sums=(
 prepare() {
   cd "$pkgname-$pkgver"
   patch -p1 -i "$srcdir/invalid-preprocessing-token.diff"
+  patch -p1 -i "$srcdir/pointer-printf-overflow.diff"
 }
 
 build() {
diff --git a/pointer-printf-overflow.diff b/pointer-printf-overflow.diff
new file mode 100644
index 000000000000..66a34c73c643
--- /dev/null
+++ b/pointer-printf-overflow.diff
@@ -0,0 +1,12 @@
+diff -Naur tuxracer-0.61/src/ui_mgr.c tuxracer-0.61-my/src/ui_mgr.c
+--- tuxracer-0.61/src/ui_mgr.c	2001-01-13 23:09:51.000000000 +0100
++++ tuxracer-0.61-my/src/ui_mgr.c	2019-01-26 12:55:40.318446087 +0100
+@@ -35,7 +35,7 @@
+ static hash_table_t widget_draw_cbs;
+ static bool_t initialized = False;
+ static bool_t needs_redraw = True;
+-static char key_buffer[12]; /* enough to hold a pointer in hex */
++static char key_buffer[sizeof(void*) * 3]; /* enough to hold a pointer in hex */
+ static point2d_t cursor_pos = { 0, 0 };
+ static bool_t left_mouse_button_down = False;
+ static bool_t middle_mouse_button_down = False;