This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-video-rice.
commit 0f192bce76b90a1a30882f81f488477ecbe51a6d Author: Sven Eckelmann <[email protected]> Date: Sun Jul 24 10:56:51 2011 +0200 Fix double infinit loop in GetValidTmemInfoIndex --- debian/changelog | 1 + debian/patches/infinit_loop.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+) diff --git a/debian/changelog b/debian/changelog index c86aa5c..21f2d5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ mupen64plus-video-rice (1.99.4-3) UNRELEASED; urgency=low - Add undefined_functions.patch, Add header for undefined min/max/memcpy - Add portable_movsxl.patch, Replace movsxl with more portable mnemonic movslq + - Add infinit_loop.patch, Fix double infinit loop in GetValidTmemInfoIndex * Depend on pkg-config in debian/control for new Makefile -- Sven Eckelmann <[email protected]> Sat, 23 Jul 2011 16:42:59 +0200 diff --git a/debian/patches/infinit_loop.patch b/debian/patches/infinit_loop.patch new file mode 100644 index 0000000..f1ffc4a --- /dev/null +++ b/debian/patches/infinit_loop.patch @@ -0,0 +1,26 @@ +Description: Fix double infinit loop in GetValidTmemInfoIndex +Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/8b1014486691 +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/src/RDP_Texture.h b/src/RDP_Texture.h +index b2a8fee02214668a59c793d0c162a061d6162f6a..d26d729365ba7c68e5200b33bf6e0d27078fc06d 100644 +--- a/src/RDP_Texture.h ++++ b/src/RDP_Texture.h +@@ -2163,12 +2163,14 @@ uint32 GetValidTmemInfoIndex(uint32 tmemAddr) + return tmemAddr; + else + { +- for( uint32 i=index; i>=0; i-- ) ++ for( uint32 x=index+1; x != 0; x-- ) + { ++ uint32 i = x - 1; + if( g_TmemFlag[i] != 0 ) + { +- for( uint32 j=0x1F; j>=0; j-- ) ++ for( uint32 y=0x20; y != 0; y-- ) + { ++ uint32 j = y - 1; + if( (g_TmemFlag[i] & (1<<j)) != 0 ) + { + return ((i<<5)+j); diff --git a/debian/patches/series b/debian/patches/series index 94c535a..08042c6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ png_truecolor_conversation.patch divide_by_zero.patch undefined_functions.patch portable_movsxl.patch +infinit_loop.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
