zparseopts should detect if it is called without option descriptions (11360)

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d7434b7ba..cc0a390cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-15  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 11360: Src/Modules/zutil.c: zparseopts should detect if it is
+ 	called without option descriptions
+	
 2000-05-15  Oliver Kiddle  <opk@zsh.org>
 
 	* 11xxx: Src/builtin.c, Src/hashtable.c, Completion/Builtins/_hash,
diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c
index 9dd228930..5524a20e5 100644
--- a/Src/Modules/zutil.c
+++ b/Src/Modules/zutil.c
@@ -1326,13 +1326,19 @@ bin_zparseopts(char *nam, char **args, char *ops, int func)
 		}
 		break;
 	    }
-	    if (!o)
+	    if (!o) {
+		o = "";
 		break;
+	    }
 	} else {
 	    args--;
 	    break;
 	}
     }
+    if (!o) {
+	zwarnnam(nam, "missing option descriptions", NULL, 0);
+	return 1;
+    }
     while ((o = dupstring(*args++))) {
 	if (!*o) {
 	    zwarnnam(nam, "invalid option description: %s", o, 0);