This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository ufoai.
commit 1c4e6c4d99eb5fd1a0854c9ef3096129a7bdc248 Author: Markus Koschany <[email protected]> Date: Tue Apr 25 14:33:29 2017 +0200 Add initialize-entityString.patch and fix the segmentation faults which occur with the map compiler ufo2map. Closes: #860680 Thanks: Bernhard Übelacker for the analysis. --- debian/patches/initialize-entityString.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) diff --git a/debian/patches/initialize-entityString.patch b/debian/patches/initialize-entityString.patch new file mode 100644 index 0000000..cdbf9e5 --- /dev/null +++ b/debian/patches/initialize-entityString.patch @@ -0,0 +1,26 @@ +From: Markus Koschany <[email protected]> +Date: Tue, 25 Apr 2017 14:31:16 +0200 +Subject: initialize entityString + +Initialize entityString to avoid that ufo2map will randomly segfault when +compiling the maps. + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860680 +Forwarded: https://sourceforge.net/p/ufoai/code/ci/bae827ba025ff1d3a56b402c27aa84401914acc4/ +--- + src/tools/ufo2map/map.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/ufo2map/map.cpp b/src/tools/ufo2map/map.cpp +index 47c49f3..f56c55e 100644 +--- a/src/tools/ufo2map/map.cpp ++++ b/src/tools/ufo2map/map.cpp +@@ -1227,7 +1227,7 @@ void LoadMapFile (const char* filename) + /* Set the number of tiles to 1. This is fix for ufo2map right now. */ + mapTiles.numTiles = 1; + +- char entityString[MAX_TOKEN_CHARS]; ++ char entityString[MAX_TOKEN_CHARS] = ""; + const char* ump = GetUMPName(filename); + if (ump != nullptr) + ParseUMP(ump, entityString, false); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e8dafba --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +initialize-entityString.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ufoai.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
