[Pkg-wmaker-commits] [wmitime] 105/127: wmitime: Allow -display option with no argument

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmitime.

commit a41a85b70a9522d68fd6190ede87bf4c4e8c1525
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sat Dec 20 01:57:02 2014 -0600

    wmitime: Allow -display option with no argument
    
    Previously, if a user ran wmitime with the -display option and no argument,
    a segmentation fault would occur. Print a warning instead.
    
    Patch from Debian [1] to fix bug #716466 [2].
    
    [1] http://sources.debian.net/src/wmitime/0.3%2B20120605-1/debian/patches/allow_display_with_no_args.patch/
    [2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=716466
---
 wmgeneral/wmgeneral.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wmgeneral/wmgeneral.c b/wmgeneral/wmgeneral.c
index c064b39..fb8a8f4 100644
--- a/wmgeneral/wmgeneral.c
+++ b/wmgeneral/wmgeneral.c
@@ -385,7 +385,11 @@ void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bit
 	for (i=1; argv[i]; i++) {
 		if (!strcmp(argv[i], "-display")) {
 			display_name = argv[i+1];
-			i++;
+			if (!display_name)
+				printf("Please provide an argument for "
+				       "-display.\n");
+			else
+				i++;
 		}
 		if (!strcmp(argv[i], "-geometry")) {
 			geometry = argv[i+1];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmitime.git