[deng] 01/03: Add mo-thinker-NULL-pointer.patch
Markus Koschany
apo at moszumanska.debian.org
Thu Jun 1 22:43:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository deng.
commit f770fb9abf386d7a4bc5695ef4dab06b691cf5e6
Author: Markus Koschany <apo at debian.org>
Date: Thu Jun 1 23:41:05 2017 +0200
Add mo-thinker-NULL-pointer.patch
Closes: #863536
Thanks: Hans Joachim Desserud for the report and Bernhard Übelacker for the patch.
---
debian/patches/Node-parent-NULL-pointer.patch | 1 +
debian/patches/mo-thinker-NULL-pointer.patch | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 26 insertions(+)
diff --git a/debian/patches/Node-parent-NULL-pointer.patch b/debian/patches/Node-parent-NULL-pointer.patch
index 49410b6..52a3f2e 100644
--- a/debian/patches/Node-parent-NULL-pointer.patch
+++ b/debian/patches/Node-parent-NULL-pointer.patch
@@ -3,6 +3,7 @@ Date: Tue, 23 May 2017 15:06:55 +0200
Subject: Node parent NULL pointer
Bug-Debian: https://bugs.debian.org/847651
+Forwarded: no
---
doomsday/libcore/src/filesys/file.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/debian/patches/mo-thinker-NULL-pointer.patch b/debian/patches/mo-thinker-NULL-pointer.patch
new file mode 100644
index 0000000..679c7fb
--- /dev/null
+++ b/debian/patches/mo-thinker-NULL-pointer.patch
@@ -0,0 +1,24 @@
+From: Bernhard Übelacker <bernhardu at mailbox.org>
+Date: Thu, 1 Jun 2017 23:39:34 +0200
+Subject: mo thinker NULL pointer
+
+Bug-Debian: https://bugs.debian.org/863536
+Forwarded: no
+---
+ doomsday/client/src/client/cl_mobj.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/doomsday/client/src/client/cl_mobj.cpp b/doomsday/client/src/client/cl_mobj.cpp
+index 1f207f5..f57270d 100644
+--- a/doomsday/client/src/client/cl_mobj.cpp
++++ b/doomsday/client/src/client/cl_mobj.cpp
+@@ -211,6 +211,9 @@ void Cl_UpdateRealPlayerMobj(mobj_t *localMobj, mobj_t *remoteClientMobj,
+
+ dd_bool Cl_IsClientMobj(mobj_t const *mo)
+ {
++ if(!mo->thinker.d)
++ return false;
++
+ if(ClientMobjThinkerData *data = THINKER_DATA_MAYBE(mo->thinker, ClientMobjThinkerData))
+ {
+ return data->hasRemoteSync();
diff --git a/debian/patches/series b/debian/patches/series
index 2b7b46e..30c1b9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ no-libexample.patch
no-timestamps.patch
no-shlibexits.patch
Node-parent-NULL-pointer.patch
+mo-thinker-NULL-pointer.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/deng.git
More information about the Pkg-games-commits
mailing list