X-Git-Url: http://git.ieval.ro/?p=xfishtank.git;a=blobdiff_plain;f=debian%2Fpatches%2Fdo-not-assume-environment-contains-display.patch;fp=debian%2Fpatches%2Fdo-not-assume-environment-contains-display.patch;h=904538b50889f4c06a834bc23189a7b791551dea;hp=0000000000000000000000000000000000000000;hb=cb68cd21e49d3bbbfcae8b53c69a5e56dd7b1a7f;hpb=057600d7ac682e493ecb7c081c7a40358e8292ed

diff --git a/debian/patches/do-not-assume-environment-contains-display.patch b/debian/patches/do-not-assume-environment-contains-display.patch
new file mode 100644
index 0000000..904538b
--- /dev/null
+++ b/debian/patches/do-not-assume-environment-contains-display.patch
@@ -0,0 +1,27 @@
+Description: Do not assume that the environment contains a DISPLAY variable
+ Previously, the code unconditionally tried to copy it to a variable.
+ This segfaults when that variable does not exist.
+Author: Marius Gavrilescu <marius@ieval.ro>
+Bug-Debian: http://bugs.debian.org/716500
+Forwarded: https://github.com/jim-rees/xfishtank/issues/5
+Bug: https://github.com/jim-rees/xfishtank/issues/5
+Last-Update: 2013-07-11
+
+--- xfishtank-2.3.orig/xfish.c
++++ xfishtank-2.3/xfish.c
+@@ -171,12 +171,14 @@ int argc;
+ char **argv;
+ {
+     int c, i;
++    const char *display = getenv("DISPLAY");
+     extern int optind;
+     extern char *optarg;
+     extern double atof();
+ 
+     pname = argv[0];
+-    strncpy(sname, getenv("DISPLAY"), sizeof(sname) - 1);
++    if(display != NULL)
++    strncpy(sname, display, sizeof(sname) - 1);
+     strcpy(cname, "MediumAquamarine");
+ 
+     while ((c = getopt(argc, argv, "dDob:C:c:p:m:f:i:r:s")) != EOF) {