From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Tue, 27 Jun 2023 11:42:24 +0000 (+0200)
Subject: lib-master: Ensure master_getopt*() functions do not return 0
X-Git-Tag: 2.4.0~2646
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=065af0827a34bd70230f6c5c5defb934a69cd927;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Ensure master_getopt*() functions do not return 0
---

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index b88a965618..02ea9ab965 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -646,6 +646,7 @@ int master_getopt(struct master_service *service)
 		if (!master_service_parse_option(service, c, optarg))
 			break;
 	}
+	i_assert(c != 0);
 	return c;
 }
 
@@ -667,6 +668,8 @@ master_getopt_long(struct master_service *service, const char **longopt_r)
 	}
 	if (longopt_idx >= 0)
 		*longopt_r = service->longopts[longopt_idx].name;
+	else
+		i_assert(c != 0);
 	return c;
 }