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-glide64mk2.
commit 3212ddfbac043969ee546be6a4c1819015fe3fc8 Author: Sven Eckelmann <[email protected]> Date: Sat May 2 10:43:57 2015 +0200 Fix segfault when loading with 4bCI texture with negative ext --- debian/changelog | 2 ++ debian/patches/fix_segfault_on_memory_load.patch | 34 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) diff --git a/debian/changelog b/debian/changelog index c51e8f3..32ae58f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ mupen64plus-video-glide64mk2 (2.5-1) UNRELEASED; urgency=medium flto=jobserver on linux - Add fix_negative_framebuffers_indices.patch, Fix negative frame_buffer indices + - Add fix_segfault_on_memory_load.patch, Fix segfault when loading + with 4bCI texture with negative ext -- Sven Eckelmann <[email protected]> Sat, 20 Sep 2014 11:04:52 +0200 diff --git a/debian/patches/fix_segfault_on_memory_load.patch b/debian/patches/fix_segfault_on_memory_load.patch new file mode 100644 index 0000000..949d77b --- /dev/null +++ b/debian/patches/fix_segfault_on_memory_load.patch @@ -0,0 +1,34 @@ +Description: Fix segfault when loading with 4bCI texture with negative ext +Origin: upstream, https://github.com/mupen64plus/mupen64plus-video-glide64mk2/commit/15f1f888422e248c6f640e587dffd12eeb48764b +Author: Richard Goedeken<[email protected]> + +--- +diff --git a/src/Glide64/TexLoad4b.h b/src/Glide64/TexLoad4b.h +index 814edad9bde8f95e4854df51440133ceefcd8bbd..58296fbbcb7398cecaba881a6999818990bc4285 100644 +--- a/src/Glide64/TexLoad4b.h ++++ b/src/Glide64/TexLoad4b.h +@@ -596,7 +596,7 @@ wxUint32 Load4bCI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int lin + { + if (wid_64 < 1) wid_64 = 1; + if (height < 1) height = 1; +- int ext = (real_width - (wid_64 << 4)) << 1; ++ int ext = (real_width - (wid_64 << 4)); + + if (rdp.tlut_mode == 0) + { +@@ -609,12 +609,13 @@ wxUint32 Load4bCI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int lin + wxUIntPtr pal = wxPtrToUInt(rdp.pal_8 + (rdp.tiles[tile].palette << 4)); + if (rdp.tlut_mode == 2) + { ++ ext <<= 1; + load4bCI ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext, (uint16_t *)pal); +- + return (1 << 16) | GR_TEXFMT_ARGB_1555; + } + +- load4bIAPal ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext, (uint16_t *)pal); ++ ext <<= 1; ++ load4bIAPal ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext, (uint16_t *)pal); + return (1 << 16) | GR_TEXFMT_ALPHA_INTENSITY_88; + } + diff --git a/debian/patches/series b/debian/patches/series index c3d06bd..2acfb98 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ revert_forced_linux_flto_jobserver.patch fix_negative_framebuffers_indices.patch +fix_segfault_on_memory_load.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64mk2.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
