From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/webcollage-helper.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'hacks/webcollage-helper.c')

diff --git a/hacks/webcollage-helper.c b/hacks/webcollage-helper.c
index 46ec608..ade45a4 100644
--- a/hacks/webcollage-helper.c
+++ b/hacks/webcollage-helper.c
@@ -1,5 +1,5 @@
 /* webcollage-helper --- scales and pastes one image into another
- * xscreensaver, Copyright (c) 2002-2017 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 2002-2020 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -28,10 +28,20 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+# if (__GNUC__ >= 4)	/* Ignore useless warnings generated by GTK headers */
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wlong-long"
+#  pragma GCC diagnostic ignored "-Wvariadic-macros"
+#  pragma GCC diagnostic ignored "-Wpedantic"
+# endif
+
 #undef HAVE_STDLIB_H /* stupid jconfig.h! */
 #include <jpeglib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+# if (__GNUC__ >= 4)
+#  pragma GCC diagnostic pop
+# endif
 
 char *progname;
 static int verbose_p = 0;
@@ -529,6 +539,8 @@ main (int argc, char **argv)
   s = strrchr (progname, '/');
   if (s) progname = s+1;
 
+  if (argc < 2) usage();
+
   if (!strcmp(argv[i], "-v"))
     verbose_p++, i++;
 
-- 
cgit v1.2.3-55-g7522