Merge tag 'upstream/2.5'

[xfishtank.git] / debian / patches / do-not-assume-environment-contains-display.patch

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) {