Bug#929886: unblock: marsshooter/0.7.6-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package marsshooter
A segmentation fault was discovered in marsshooter, that may crash the
game and make it unusable. This is Debian bug #929513. Bernhard
Übelacker provided a patch. Please find attached the debdiff.
Thanks,
Markus
unblock marsshooter/0.7.6-4
-- System Information:
Debian Release: 10.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-9-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: unable to detect
diff -Nru marsshooter-0.7.6/debian/changelog marsshooter-0.7.6/debian/changelog
--- marsshooter-0.7.6/debian/changelog 2018-07-29 02:33:04.000000000 +0200
+++ marsshooter-0.7.6/debian/changelog 2019-05-29 14:55:09.000000000 +0200
@@ -1,3 +1,11 @@
+marsshooter (0.7.6-4) unstable; urgency=medium
+
+ * Add avoid-crash-because-of-missing-return-statement.patch.
+ Fix potential crash by adding proper return statements.
+ Thanks to Bernhard Übelacker for the patch (Closes: #929513)
+
+ -- Markus Koschany <apo@debian.org> Wed, 29 May 2019 14:55:09 +0200
+
marsshooter (0.7.6-3) unstable; urgency=medium
* Switch to compat level 11.
diff -Nru marsshooter-0.7.6/debian/patches/avoid-crash-because-of-missing-return-statement.patch marsshooter-0.7.6/debian/patches/avoid-crash-because-of-missing-return-statement.patch
--- marsshooter-0.7.6/debian/patches/avoid-crash-because-of-missing-return-statement.patch 1970-01-01 01:00:00.000000000 +0100
+++ marsshooter-0.7.6/debian/patches/avoid-crash-because-of-missing-return-statement.patch 2019-05-29 14:55:09.000000000 +0200
@@ -0,0 +1,72 @@
+From 61b2f879bf460645faf39b4729e355ea13ee6eec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernhardu@mailbox.org>
+Date: Tue, 28 May 2019 10:30:01 +0200
+Subject: Avoid crash because of missing return statement.
+
+warning: no return statement in function returning non-void [-Wreturn-type]
+warning: control reaches end of non-void function [-Wreturn-type]
+
+Debian-Bug: https://bugs.debian.org/929513
+---
+ include/Specials/NoSpecial.hpp | 2 +-
+ include/Weapons/NoWeapon.hpp | 6 +++---
+ src/Interface/Tab.cpp | 2 ++
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/include/Specials/NoSpecial.hpp b/include/Specials/NoSpecial.hpp
+index 4c1c8d3..67c3fa4 100644
+--- a/include/Specials/NoSpecial.hpp
++++ b/include/Specials/NoSpecial.hpp
+@@ -32,7 +32,7 @@ class NoSpecial: public Special {
+ /// Does nothing.
+ void activate() const {}
+
+- float radius() const {}
++ float radius() const { return 0.; }
+
+ /// Draws the special.
+ void draw(float alpha) const;
+diff --git a/include/Weapons/NoWeapon.hpp b/include/Weapons/NoWeapon.hpp
+index e739851..38c8b2c 100644
+--- a/include/Weapons/NoWeapon.hpp
++++ b/include/Weapons/NoWeapon.hpp
+@@ -35,13 +35,13 @@ class NoWeapon: public Weapon {
+ void draw(float alpha) const {}
+
+ /// Returns the maximum distance from which this weapon should be used.
+- float maxDistance() const {}
++ float maxDistance() const { return 0.; }
+
+ /// Returns the minimum distance from which this weapon should be used.
+- float minDistance() const {}
++ float minDistance() const { return 0.; }
+
+ /// Returns the maximum angle from which this weapon should be used.
+- float maxAngle() const {}
++ float maxAngle() const { return 0.; }
+ };
+
+ # endif // NOWEAPON_HPP_INCLUDED
+diff --git a/src/Interface/Tab.cpp b/src/Interface/Tab.cpp
+index 19a7e26..e0dd57e 100644
+--- a/src/Interface/Tab.cpp
++++ b/src/Interface/Tab.cpp
+@@ -110,6 +110,7 @@ bool Tab::tabNext() {
+ return true;
+ }
+ }
++ return false;
+ }
+
+ bool Tab::tabPrevious() {
+@@ -140,6 +141,7 @@ bool Tab::tabPrevious() {
+ return true;
+ }
+ }
++ return false;
+ }
+
+
+--
+2.20.1
+
diff -Nru marsshooter-0.7.6/debian/patches/series marsshooter-0.7.6/debian/patches/series
--- marsshooter-0.7.6/debian/patches/series 2018-07-29 02:33:04.000000000 +0200
+++ marsshooter-0.7.6/debian/patches/series 2019-05-29 14:55:09.000000000 +0200
@@ -1,2 +1,3 @@
man-page.patch
desktop-file.patch
+avoid-crash-because-of-missing-return-statement.patch
Reply to: