Author: vincentc-guest Date: 2011-11-30 08:07:22 +0000 (Wed, 30 Nov 2011) New Revision: 12899
Added: packages/trunk/monster-masher/debian/patches/crash_after_intro.patch Modified: packages/trunk/monster-masher/debian/changelog packages/trunk/monster-masher/debian/patches/series Log: monster-masher: fix #636014 Modified: packages/trunk/monster-masher/debian/changelog =================================================================== --- packages/trunk/monster-masher/debian/changelog 2011-11-30 07:04:16 UTC (rev 12898) +++ packages/trunk/monster-masher/debian/changelog 2011-11-30 08:07:22 UTC (rev 12899) @@ -1,3 +1,11 @@ +monster-masher (1.8.1-5) unstable; urgency=low + + * Add debian/patches/crash_after_intro.patch; fix segfault when starting + new game after viewing introduction. Thanks to Steve Cotton for the patch. + (Closes: #636014) + + -- Vincent Cheng <[email protected]> Tue, 29 Nov 2011 22:27:13 -0800 + monster-masher (1.8.1-4) unstable; urgency=low * Backport debian/patches/add-esound-as-dependency.patch from Ubuntu; Added: packages/trunk/monster-masher/debian/patches/crash_after_intro.patch =================================================================== --- packages/trunk/monster-masher/debian/patches/crash_after_intro.patch (rev 0) +++ packages/trunk/monster-masher/debian/patches/crash_after_intro.patch 2011-11-30 08:07:22 UTC (rev 12899) @@ -0,0 +1,22 @@ +Description: Fix segfault when starting new game after viewing introduction + Segfault is caused by memory corruption when Intro.update calls + intro_finished(), and intro_finished deletes the Intro. This patch is a + workaround to stop the game from crashing. +Forwarded: not yet +Author: Steve Cotton <[email protected]> +Bug-Debian: http://bugs.debian.org/636014 + +--- a/src/intro.cpp ++++ b/src/intro.cpp +@@ -150,7 +150,11 @@ + else if (state == (sum += 12)) + ; // do nothing, just wait + else if (state >= (sum += 1)) ++ { + mw.intro_finished(); ++ // this Intro has just been deleted, so return immediately ++ return true; ++ } + else + changed = false; + Modified: packages/trunk/monster-masher/debian/patches/series =================================================================== --- packages/trunk/monster-masher/debian/patches/series 2011-11-30 07:04:16 UTC (rev 12898) +++ packages/trunk/monster-masher/debian/patches/series 2011-11-30 08:07:22 UTC (rev 12899) @@ -1,2 +1,3 @@ add-esound-as-dependency.patch +crash_after_intro.patch desktop_lintian.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
