[SCM] game about viruses invading your computer branch, master, updated. debian/1.0-1.dfsg.1-1-5-gd614a4c

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 51e7886d9a03ce7cdee6af7d6e449b7f38d8e214
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Fri Dec 2 12:51:50 2011 -0500

    Fixed a segfault in pak during packaging build.

diff --git a/debian/changelog b/debian/changelog
index 7610f27..0c6aca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+viruskiller (1.0-1.dfsg.1-1.1) unstable; urgency=low
+
+  * Fixed a segfault in pak during packaging build.
+
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Fri, 02 Dec 2011 12:40:11 -0500
+
 viruskiller (1.0-1.dfsg.1-1) unstable; urgency=low
 
   * Now maintained by the Debian Games Team. (Closes: #523371)
diff --git a/debian/patches/0006-fix-pak-segfault.patch b/debian/patches/0006-fix-pak-segfault.patch
new file mode 100644
index 0000000..002da12
--- /dev/null
+++ b/debian/patches/0006-fix-pak-segfault.patch
@@ -0,0 +1,26 @@
+Description: Fixes a FTBFS when pak segfaults on non-existing directories.
+Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
+
+--- a/src/pak.cpp
++++ b/src/pak.cpp
+@@ -19,6 +19,7 @@
+ */
+ 
+ #include "pak.h"
++#include <errno.h>
+ 
+ FILE *pak;
+ int dirs = 0, files = 0;
+@@ -46,6 +47,12 @@
+ 	DIR *dirp, *dirp2;
+ 	dirent *dfile;
+ 	dirp = opendir(dirName);
++	if (!dirp)
++        {
++          fprintf(stderr, "error %d opening %s: %s\n", errno, dirName, strerror(errno));
++          return;
++        }
++
+ 	char filename[1024];
+ 
+ 	while ((dfile = readdir(dirp)))
diff --git a/debian/patches/series b/debian/patches/series
index 236ad57..5238433 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ dont_crash_if_no_sound_files.patch
 desktop-file.patch
 spelling.patch
 link-libz.patch
+0006-fix-pak-segfault.patch

-- 
game about viruses invading your computer