[mupen64plus] 84/262: Fix crash when loading textures from texturepacks with rice_video

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit c6372966f371242bc26ed13dc80cb46a5941e116
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Thu Jun 18 19:34:26 2009 +0200

    Fix crash when loading textures from texturepacks with rice_video
---
 debian/changelog                                |  8 ++++++++
 debian/patches/111-rice-texturepack-crash.patch | 27 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0fae8c6..9faec5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low
+
+  * debian:patches:
+    - Add 111-rice-texturepack-crash.patch, Fix crash when loading textures
+      from texturepacks with rice_video
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de>  Thu, 18 Jun 2009 19:33:23 +0200
+
 mupen64plus (1.5+dfsg1-1) unstable; urgency=low
 
   * Initial release (Closes: #513322)
diff --git a/debian/patches/111-rice-texturepack-crash.patch b/debian/patches/111-rice-texturepack-crash.patch
new file mode 100644
index 0000000..e0008a3
--- /dev/null
+++ b/debian/patches/111-rice-texturepack-crash.patch
@@ -0,0 +1,27 @@
+From 56290ed050d7639578fa0ec3bf84fa3ac90e2749 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven.eckelmann at gmx.de>
+Date: Thu, 18 Jun 2009 19:09:31 +0200
+Subject: [PATCH] Fix segfault in rice_video using TexturePack
+
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ rice_video/TextureFilters.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/rice_video/TextureFilters.cpp b/rice_video/TextureFilters.cpp
+index 59eb85c..e59f797 100644
+--- a/rice_video/TextureFilters.cpp
++++ b/rice_video/TextureFilters.cpp
+@@ -891,7 +891,7 @@ typedef struct {
+     int pal_crc32;
+     char *foldername;
+     //char name[40];
+-    char RGBNameTail[20];
++    char RGBNameTail[23];
+     char AlphaNameTail[20];
+     TextureType type;
+     bool        bSeparatedAlpha;
+-- 
+1.6.3.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 26acd18..d9ce299 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 108-remove-gln64.patch
 109-remove-nondfsg-icons.patch
 110-glide64-noasm.patch
+111-rice-texturepack-crash.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git