[zoom-player] 03/03: Avoid crashing on invalid coordinates.

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository zoom-player.

commit 26d30ff9fb3b435e8c0a29b65d1b219957ec715c
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Feb 6 14:02:32 2016 +0100

    Avoid crashing on invalid coordinates.
---
 debian/changelog                                |  2 ++
 debian/patches/avoid-v6-set-colours-crash.patch | 18 ++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 019c4f7..8f85764 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ zoom-player (1.1.5~dfsg-2) UNRELEASED; urgency=medium
 
   [ Alexandre Detiste ]
   * Revert to a version 3 watch file.
+  * Avoid crashing on invalid coordinates when setting colours in V6 games
+    (Zork Zero in particular). Closes: #813674.
 
   [ Stephen Kitt ]
   * Switch to https: VCS URIs (see #810378).
diff --git a/debian/patches/avoid-v6-set-colours-crash.patch b/debian/patches/avoid-v6-set-colours-crash.patch
new file mode 100644
index 0000000..75215cc
--- /dev/null
+++ b/debian/patches/avoid-v6-set-colours-crash.patch
@@ -0,0 +1,18 @@
+Description: Avoid crashing with invalid coordinates
+Author: Alexandre Detiste <alexandre.detiste at gmail.com>
+Bug-Debian: https://bugs.debian.org/813674
+
+--- a/src/v6display.c
++++ b/src/v6display.c
+@@ -498,9 +498,9 @@
+     fg = ACTWIN.fore;
+   if (bg == -2)
+     bg = ACTWIN.back;
+-  if (fg == -1)
++  if (fg == -1 || ACTWIN.curx < 0 || ACTWIN.cury < 0)
+     fg = DEFAULT_FORE;
+-  if (bg == -1)
++  if (bg == -1 || ACTWIN.curx < 0 || ACTWIN.cury < 0)
+     bg = DEFAULT_BACK;
+ 
+   if (bg == -3)
diff --git a/debian/patches/series b/debian/patches/series
index 660ca19..721d6c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+avoid-v6-set-colours-crash.patch
 acinclude.patch
 restore-return.patch
 xft-pkg-config.patch

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