[mupen64plus-video-arachnoid] 49/147: Fix write past the end of m_fillColor when initialising CombinerBase

[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-video-arachnoid.

commit 36392ba7f9a3f5e4aee5d90492330cbf568cb961
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Jul 24 10:20:15 2011 +0200

    Fix write past the end of m_fillColor when initialising CombinerBase
---
 debian/changelog                  |  2 ++
 debian/patches/array_bounds.patch | 18 ++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f00bc06..44d8bb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mupen64plus-video-arachnoid (1.99.4-3) UNRELEASED; urgency=low
   * debian/patches:
     - Remove obsolete default-optimisations.patch
     - Add rewrite_makefile.patch, Rewrite Makefile to fix flags and linking
+    - Add array_bounds.patch, Fix write past the end of m_fillColor when
+      initialising CombinerBase
   * Depend on pkg-config in debian/control for new Makefile
 
  -- Sven Eckelmann <sven at narfation.org>  Sat, 23 Jul 2011 16:42:55 +0200
diff --git a/debian/patches/array_bounds.patch b/debian/patches/array_bounds.patch
new file mode 100644
index 0000000..a9deda5
--- /dev/null
+++ b/debian/patches/array_bounds.patch
@@ -0,0 +1,18 @@
+Description: Fix write past the end of m_fillColor
+Origin: upstream, https://bitbucket.org/wahrhaft/mupen64plus-video-arachnoid/changeset/6886c9e27c51
+Author: Sven Eckelmann <sven at narfation.org>
+
+---
+diff --git a/src/Combiner/CombinerBase.cpp b/src/Combiner/CombinerBase.cpp
+index c0cef06d28b7ef94df4336e8d8363aaef2dc4fb7..c9689490d6ae4ba1f4e19aee05da9101871daa4e 100755
+--- a/src/Combiner/CombinerBase.cpp
++++ b/src/Combiner/CombinerBase.cpp
+@@ -31,8 +31,6 @@ CombinerBase::CombinerBase()
+     m_fillColor[1] = m_blendColor[1] = m_primColor[1] = m_envColor[1] = 0;
+     m_fillColor[2] = m_blendColor[2] = m_primColor[2] = m_envColor[2] = 0;
+     m_fillColor[3] = m_blendColor[3] = m_primColor[3] = m_envColor[3] = 1;
+-    m_fillColor[4] = 0;
+-    m_fillColor[5] = 0;
+ }
+ 
+ //-----------------------------------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index c753e70..25602ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 rewrite_makefile.patch
+array_bounds.patch

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