From dfd5cc37b043f2a31e153ed125a68b4a2d171503 Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Fri, 11 Mar 2005 21:20:15 +0000
Subject: Never access argv[i+1] before you know that argv[i] != NULL. Approved
 by wiz.

---
 pkgtools/pkg_install/files/admin/main.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c
index ed2da7f2550..75af64029a7 100644
--- a/pkgtools/pkg_install/files/admin/main.c
+++ b/pkgtools/pkg_install/files/admin/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.17 2004/12/29 12:16:56 agc Exp $	*/
+/*	$NetBSD: main.c,v 1.18 2005/03/11 21:20:15 rillig Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.17 2004/12/29 12:16:56 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.18 2005/03/11 21:20:15 rillig Exp $");
 #endif
 
 /*
@@ -511,13 +511,13 @@ main(int argc, char *argv[])
 		
 		argv++;		/* "pmatch" */
 
-		pattern = argv[0];
-		pkg = argv[1];
-
-		if (pattern == NULL || pkg == NULL) {
+		if (argv[0] == NULL || argv[1] == NULL) {
 			usage(prog);
 		}
 
+		pattern = argv[0];
+		pkg = argv[1];
+
 		if (pmatch(pattern, pkg)){
 			return 0;
 		} else {
-- 
cgit v1.2.3