CVS commit: pkgsrc/games/xbomb

["Jonathan A. Kollasch" <jakllsch%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Sun Oct  6 14:41:07 UTC 2019

Modified Files:
        pkgsrc/games/xbomb: distinfo
Added Files:
        pkgsrc/games/xbomb/patches: patch-xwindow.c

Log Message:
games/xbomb: Add patch to avoid UB and/or segfault on startup


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/games/xbomb/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/xbomb/patches/patch-xwindow.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/xbomb/distinfo
diff -u pkgsrc/games/xbomb/distinfo:1.5 pkgsrc/games/xbomb/distinfo:1.6
--- pkgsrc/games/xbomb/distinfo:1.5     Wed Mar 30 10:00:07 2016
+++ pkgsrc/games/xbomb/distinfo Sun Oct  6 14:41:07 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2016/03/30 10:00:07 jperkin Exp $
+$NetBSD: distinfo,v 1.6 2019/10/06 14:41:07 jakllsch Exp $
 
 SHA1 (xbomb-2.2.tgz) = 065d9283c92ff0dca844b637f237a381b1ad72c0
 RMD160 (xbomb-2.2.tgz) = 51a212d8cbe62d765e75751ae7b3d341ce6a3ada
@@ -6,3 +6,4 @@ SHA512 (xbomb-2.2.tgz) = fd3c77c4c5e13a8
 Size (xbomb-2.2.tgz) = 24872 bytes
 SHA1 (patch-aa) = e25b71c414b67d8d7d588cabbd8da7e667678835
 SHA1 (patch-ab) = 94ba453322e35eb07a81f223e36563dceac04bdc
+SHA1 (patch-xwindow.c) = e0e216c48214c1b976f8d18359ef97e4f9438f71

Added files:

Index: pkgsrc/games/xbomb/patches/patch-xwindow.c
diff -u /dev/null pkgsrc/games/xbomb/patches/patch-xwindow.c:1.1
--- /dev/null   Sun Oct  6 14:41:07 2019
+++ pkgsrc/games/xbomb/patches/patch-xwindow.c  Sun Oct  6 14:41:07 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-xwindow.c,v 1.1 2019/10/06 14:41:07 jakllsch Exp $
+
+Avoid segfault in InitialiseX()
+
+--- xwindow.c.orig     2008-01-05 19:24:16.000000000 +0000
++++ xwindow.c
+@@ -245,7 +245,8 @@ void InitialiseX(int *argc,char **argv)
+  values.font=resources.fontstruct->fid;
+  for(i=0;i<NUM_GC;i++)
+    {
+-    values.foreground=resources.colours[i];
++    if(i<(sizeof(resources.colours)/sizeof(resources.colours[0])))
++       values.foreground=resources.colours[i];
+     if(i==GC_UNSEEN)
+       {
+        GC tempgc;