From: Mark Andrews <marka@isc.org>
Date: Tue, 23 Aug 2005 03:01:14 +0000 (+0000)
Subject: adjust builtin syntax checks [RT#15268]
X-Git-Tag: v9.2.6b1~28^2~31
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=497beda397448fa28410462d507916f56e98dc6a;p=thirdparty%2Fbind9.git

adjust builtin syntax checks [RT#15268]
---

diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index a8ecde959aa..bcfbd48c669 100644
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: builtin.c,v 1.8 2005/08/18 00:57:26 marka Exp $ */
+/* $Id: builtin.c,v 1.9 2005/08/23 03:01:14 marka Exp $ */
 
 /*! \file
  * \brief
@@ -214,11 +214,15 @@ static isc_result_t
 builtin_create(const char *zone, int argc, char **argv,
 	       void *driverdata, void **dbdata)
 {
+	REQUIRE(argc >= 1);
+
 	UNUSED(zone);
 	UNUSED(driverdata);
 
-	if ((argc != 1 && strcmp(argv[0], "empty") != 0) ||
-	    argc != 3)
+	if (strcmp(argv[0], "empty") == 0) {
+		if (argc != 3)
+			return (DNS_R_SYNTAX);
+	} else if (argc != 1)
 		return (DNS_R_SYNTAX);
 
 	if (strcmp(argv[0], "version") == 0)