wordwarvi: Walk-around memory corruption

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jul 26 21:57:59 2016 +0200
Changeset:	cbe03a62497177fc77f86efb62f555079848c5a0

Modified Files:
	wordwarvi/distinfo
	wordwarvi/patches/patch-wordwarvi.c
Removed Files:
	wordwarvi/TODO

Log Message:
wordwarvi: Walk-around memory corruption

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cbe03a62497177fc77f86efb62f555079848c5a0

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

diffstat:
 wordwarvi/TODO                      | 34 ----------------------------------
 wordwarvi/distinfo                  |  2 +-
 wordwarvi/patches/patch-wordwarvi.c | 21 +++++++++++++++++++--
 3 files changed, 20 insertions(+), 37 deletions(-)

diffs:
diff --git a/wordwarvi/TODO b/wordwarvi/TODO
deleted file mode 100644
index 7e58e8d..0000000
--- a/wordwarvi/TODO
+++ /dev/null
@@ -1,34 +0,0 @@
-Core dumps very soon, during intro or at startup.
-
-(gdb) bt
-#0  0x00000000004105e4 in draw_objs ()
-#1  0x0000000000411a67 in main_da_expose ()
-#2  0x00007f7ffd02d61d in gtk_marshal_BOOLEAN__VOID ()
-   from /usr/pkg/lib/libgtk-x11-2.0.so.0
-#3  0x00007f7ffa60b329 in g_closure_invoke ()
-   from /usr/pkg/lib/libgobject-2.0.so.0
-#4  0x00007f7ffa61b8d1 in g_signal_chain_from_overridden ()
-   from /usr/pkg/lib/libgobject-2.0.so.0
-#5  0x00007f7ffa61c9f8 in g_signal_emit_valist ()
-   from /usr/pkg/lib/libgobject-2.0.so.0
-#6  0x00007f7ffa61cd93 in g_signal_emit ()
-   from /usr/pkg/lib/libgobject-2.0.so.0
-#7  0x00007f7ffd11f99e in gtk_widget_class_list_style_properties ()
-   from /usr/pkg/lib/libgtk-x11-2.0.so.0
-#8  0x00007f7ffd027a80 in gtk_main_do_event ()
-   from /usr/pkg/lib/libgtk-x11-2.0.so.0
-#9  0x00007f7ffcd38f30 in gdk_window_is_viewable ()
-   from /usr/pkg/lib/libgdk-x11-2.0.so.0
-#10 0x00007f7ffcd39536 in gdk_window_process_all_updates ()
-   from /usr/pkg/lib/libgdk-x11-2.0.so.0
-#11 0x00007f7ffcd39559 in gdk_window_process_all_updates ()
-   from /usr/pkg/lib/libgdk-x11-2.0.so.0
-#12 0x00007f7ffcd1eeae in gdk_threads_add_timeout_seconds ()
-   from /usr/pkg/lib/libgdk-x11-2.0.so.0
-#13 0x00007f7ffa0350d2 in g_main_context_dispatch ()
-   from /usr/pkg/lib/libglib-2.0.so.0
-#14 0x00007f7ffa0383a5 in g_main_context_check ()
-   from /usr/pkg/lib/libglib-2.0.so.0
-#15 0x00007f7ffa03869d in g_main_loop_run () from /usr/pkg/lib/libglib-2.0.so.0
-#16 0x00007f7ffd027c52 in gtk_main () from /usr/pkg/lib/libgtk-x11-2.0.so.0
-#17 0x0000000000427d86 in main ()
diff --git a/wordwarvi/distinfo b/wordwarvi/distinfo
index f484bc8..81013ef 100644
--- a/wordwarvi/distinfo
+++ b/wordwarvi/distinfo
@@ -5,4 +5,4 @@ RMD160 (wordwarvi-1.0.2.tar.gz) = ab4a0442384610db3fd9d598c183638949612546
 SHA512 (wordwarvi-1.0.2.tar.gz) = 231e02b339dc1f73345113ee37ddcd4fc5110e6e4402b46aee60a969c6b554cc59dc4bb6389f2537d1e418489831f84580fadb05df42ebeede7b56945389b86d
 Size (wordwarvi-1.0.2.tar.gz) = 8814650 bytes
 SHA1 (patch-Makefile) = 6bfbabe7d925e0332c482ba5d4d7911e66f22698
-SHA1 (patch-wordwarvi.c) = 140b2bbef5741c0d7a4c5d7813c54d3903c0a73e
+SHA1 (patch-wordwarvi.c) = 2317eaa5f8428b4831182b55723f81971c48c34c
diff --git a/wordwarvi/patches/patch-wordwarvi.c b/wordwarvi/patches/patch-wordwarvi.c
index 99ce3ac..d774de2 100644
--- a/wordwarvi/patches/patch-wordwarvi.c
+++ b/wordwarvi/patches/patch-wordwarvi.c
@@ -1,10 +1,27 @@
 $NetBSD: patch-ab,v 1.1.1.1 2008/12/25 12:27:03 thomasklausner Exp $
 
+Walk-around memory corruption (double-free(3)?)
+
 Use standard getopt_long(3) - fixes NetBSD.
 
---- wordwarvi.c.orig	2008-12-12 02:24:34.000000000 +0000
+--- wordwarvi.c.orig	2016-03-11 15:16:11.000000000 +0000
 +++ wordwarvi.c
-@@ -13078,7 +13078,7 @@ int main(int argc, char *argv[])
+@@ -11559,12 +11559,14 @@ void start_level()
+ 	srandom(level.random_seed);
+ 	generate_terrain(&terrain);
+ 
++#if 0
+ 	add_buildings(&terrain);/* Some FreeBSD users report that */
+ 				/*add_buildings() causes crashes. */
+ 				/* Commenting this out on FreeBSD */
+ 				/* may help, but, no buildings. */
+ 				/* I've looked at the code, but */
+ 				/* don't see anything wrong with it. */
++#endif
+ 	add_humanoids(&terrain);
+ 	add_bridges(&terrain);
+ 	add_socket(&terrain);
+@@ -13967,7 +13969,7 @@ int main(int argc, char *argv[])
  
  	while (1) {
  		int rc, n;