[deng] 01/02: Add Node-parent-NULL-pointer.patch

[Markus Koschany]

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

apo pushed a commit to branch master
in repository deng.

commit 14271322fee8f7af6129daeb7b0162670d3a95c8
Author: Markus Koschany <apo at debian.org>
Date:   Tue May 23 15:08:01 2017 +0200

    Add Node-parent-NULL-pointer.patch
    
    and fix startup crash.
    
    Thanks: Bernhard Übelacker <bernhardu at mailbox.org> for the patch.
    Closes: #847651
---
 debian/patches/Node-parent-NULL-pointer.patch | 23 +++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/Node-parent-NULL-pointer.patch b/debian/patches/Node-parent-NULL-pointer.patch
new file mode 100644
index 0000000..49410b6
--- /dev/null
+++ b/debian/patches/Node-parent-NULL-pointer.patch
@@ -0,0 +1,23 @@
+From: Bernhard Übelacker <bernhardu at mailbox.org>
+Date: Tue, 23 May 2017 15:06:55 +0200
+Subject: Node parent NULL pointer
+
+Bug-Debian: https://bugs.debian.org/847651
+---
+ doomsday/libcore/src/filesys/file.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/doomsday/libcore/src/filesys/file.cpp b/doomsday/libcore/src/filesys/file.cpp
+index fd9b8dc..a4a21c5 100644
+--- a/doomsday/libcore/src/filesys/file.cpp
++++ b/doomsday/libcore/src/filesys/file.cpp
+@@ -111,6 +111,9 @@ FileSystem &File::fileSystem()
+ 
+ Folder *File::parent() const
+ {
++    if (!Node::parent())
++        return NULL;
++
+     return Node::parent()->maybeAs<Folder>();
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a3ca383..2b7b46e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ spelling.patch
 no-libexample.patch
 no-timestamps.patch
 no-shlibexits.patch
+Node-parent-NULL-pointer.patch

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