Author: pabs Date: 2012-02-19 08:04:44 +0000 (Sun, 19 Feb 2012) New Revision: 13261
Added: packages/trunk/zaz/debian/patches/mismatched_delete.patch packages/trunk/zaz/debian/patches/no_music_2.patch Modified: packages/trunk/zaz/debian/changelog packages/trunk/zaz/debian/patches/series Log: Add patches by Steve Cotton to fix crashes (Closes: #649017; LP: #656468) Modified: packages/trunk/zaz/debian/changelog =================================================================== --- packages/trunk/zaz/debian/changelog 2012-02-16 10:05:13 UTC (rev 13260) +++ packages/trunk/zaz/debian/changelog 2012-02-19 08:04:44 UTC (rev 13261) @@ -3,6 +3,9 @@ [ Miriam Ruiz ] * Fixed man page + [ Paul Wise ] + * Add patches by Steve Cotton to fix crashes (Closes: #649017; LP: #656468) + -- Miriam Ruiz <[email protected]> Tue, 29 Nov 2011 23:11:19 +0100 zaz (1.0.0~dfsg1-1) unstable; urgency=low Added: packages/trunk/zaz/debian/patches/mismatched_delete.patch =================================================================== --- packages/trunk/zaz/debian/patches/mismatched_delete.patch (rev 0) +++ packages/trunk/zaz/debian/patches/mismatched_delete.patch 2012-02-19 08:04:44 UTC (rev 13261) @@ -0,0 +1,15 @@ +Author: Steve Cotton <[email protected]> +Description: Fix crash, fixes a potential memory corruption +Bug-Debian: http://bugs.debian.org/649017 +Bug-Ubuntu: http://launchpad.net/bugs/656468 +--- a/src/game.cpp ++++ b/src/game.cpp +@@ -266,7 +266,7 @@ + delete ballPaths[b]; + } + +- delete ballPaths; ++ delete[] ballPaths; + if (ownTextures) + glDeleteTextures(14, ballText); + Added: packages/trunk/zaz/debian/patches/no_music_2.patch =================================================================== --- packages/trunk/zaz/debian/patches/no_music_2.patch (rev 0) +++ packages/trunk/zaz/debian/patches/no_music_2.patch 2012-02-19 08:04:44 UTC (rev 13261) @@ -0,0 +1,18 @@ +Author: Steve Cotton <[email protected]> +Description: Fix crash, makes Restart() a no-op if the music isn't loaded +Bug-Debian: http://bugs.debian.org/649017 +Bug-Ubuntu: http://launchpad.net/bugs/656468 +--- a/src/streamingoggsample.cpp ++++ b/src/streamingoggsample.cpp +@@ -141,6 +141,11 @@ + + void StreamingOggSample::Restart() + { ++ if (!loaded) ++ { ++ return; ++ } ++ + ov_raw_seek(&vf,0); + }; + } Modified: packages/trunk/zaz/debian/patches/series =================================================================== --- packages/trunk/zaz/debian/patches/series 2012-02-16 10:05:13 UTC (rev 13260) +++ packages/trunk/zaz/debian/patches/series 2012-02-19 08:04:44 UTC (rev 13261) @@ -1 +1,3 @@ no_music.patch +no_music_2.patch +mismatched_delete.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
