From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 5 Nov 2016 13:29:11 +0000 (+0000)
Subject: xduplic-copier: Print error message, rather than segfaulting, if XOpenDisplay fails.
X-Git-Tag: archive/debian/5.0.0~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=97579ece00da4f34cdb8460311b5c56bd7fba161

xduplic-copier: Print error message, rather than segfaulting, if XOpenDisplay fails.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/cprogs/xduplic-copier.c b/cprogs/xduplic-copier.c
index 80374f9..7118d95 100644
--- a/cprogs/xduplic-copier.c
+++ b/cprogs/xduplic-copier.c
@@ -234,6 +234,7 @@ int main(int argc, const char **argv) {
   Font font;
 
   display= XOpenDisplay(0);
+  if (!display) { fputs("XOpenDisplay failed\n",stderr); exit(-1); }
   screen= DefaultScreen(display);
   cmap= DefaultColormap(display,screen);
   root= DefaultRootWindow(display);
diff --git a/debian/changelog b/debian/changelog
index 9ddbbbf..bdbe159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ chiark-utils (4.5.0~iwj5) unstable; urgency=medium
   * Fix tiny typo in long description.  Closes:#819746.  (Luke Faraone.)
   * Fix build repro by using gzip -n.  Closes:#777300.  (Chris Lamb.)
   * xduplic-copier: Drop obsolete variable "ts_last".
+  * xduplic-copier: Print error message, rather than segfaulting,
+    if XOpenDisplay fails.
 
   debian/rules file tidying:
   * Drop seddery for libgmp3c2 C++ ABI transition.