[winmbf] 02/02: Fix another segfault with single subsector maps

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository winmbf.

commit 1b17c7f66a3e10260d4238d40441c3b9171c668c
Author: Fabian Greffrath <fabian at debian.org>
Date:   Tue Feb 9 21:39:25 2016 +0100

    Fix another segfault with single subsector maps
---
 debian/changelog                     |  3 ++-
 debian/patches/crash-subsector.patch | 11 +++++++++++
 debian/patches/series                |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 477c222..6170b73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ winmbf (2.03+svn18+dfsg1-1) unstable; urgency=low
     + Fix a segfault when a menu is left while not in-game.
     + Fix another segfault with empty reject matrices,
       as e.g. found in the HACX 1.2 IWAD.
+    + Fix another segfault with single subsector maps.
     + Fix another segfault when a video mode fails to set.
     + Add support for a global data directory.
     + Change location for config file and tranmap.dat to a directory
@@ -18,4 +19,4 @@ winmbf (2.03+svn18+dfsg1-1) unstable; urgency=low
       Doom 3 BFG Edition.
     + Replace missing menu entries and titles by text written in the HU font.
 
- -- Fabian Greffrath <fabian+debian at greffrath.com>  Mon, 11 May 2015 13:21:00 +0200
+ -- Fabian Greffrath <fabian at debian.org>  Tue, 09 Feb 2016 21:35:42 +0100
diff --git a/debian/patches/crash-subsector.patch b/debian/patches/crash-subsector.patch
new file mode 100644
index 0000000..647eb3d
--- /dev/null
+++ b/debian/patches/crash-subsector.patch
@@ -0,0 +1,11 @@
+--- a/Source/r_main.c
++++ b/Source/r_main.c
+@@ -435,6 +435,8 @@ void R_Init (void)
+ subsector_t *R_PointInSubsector(fixed_t x, fixed_t y)
+ {
+   int nodenum = numnodes-1;
++  if (!numnodes)
++    return subsectors;
+   while (!(nodenum & NF_SUBSECTOR))
+     nodenum = nodes[nodenum].children[R_PointOnSide(x, y, nodes+nodenum)];
+   return &subsectors[nodenum & ~NF_SUBSECTOR];
diff --git a/debian/patches/series b/debian/patches/series
index 0eee960..199ead9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@ security-formatstring.patch
 crash-gamestate.patch
 crash-rejectmatrix.patch
 crash-videomode.patch
+crash-subsector.patch
 feature-homedir.patch
 feature-datadir.patch
 #feature-fullscreenmenu.patch

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