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 80374f96fc5a8d57c7b1f5fbfdd3baae235688d4..7118d951a9d8444f121979b55b9b8d1e8bbda211 100644 (file)
--- 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);
   Font font;
 
   display= XOpenDisplay(0);

+  if (!display) { fputs("XOpenDisplay failed\n",stderr); exit(-1); }

   screen= DefaultScreen(display);
   cmap= DefaultColormap(display,screen);
   root= DefaultRootWindow(display);
   screen= DefaultScreen(display);
   cmap= DefaultColormap(display,screen);
   root= DefaultRootWindow(display);

diff --git a/debian/changelog b/debian/changelog
index 9ddbbbfef986601cdfc7854a5b672cee55ba7b88..bdbe1596d1d0a7e43ac13949ec44575e551a0097 100644 (file)
--- 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".
   * 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.
 
   debian/rules file tidying:
   * Drop seddery for libgmp3c2 C++ ABI transition.