[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/admin Never access argv[i+1...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20bddbb8be37
branches:  trunk
changeset: 490463:20bddbb8be37
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Mar 11 21:20:15 2005 +0000

description:
Never access argv[i+1] before you know that argv[i] != NULL. Approved
by wiz.

diffstat:

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

diffs (36 lines):

diff -r 9478ed4d6ed2 -r 20bddbb8be37 pkgtools/pkg_install/files/admin/main.c
--- a/pkgtools/pkg_install/files/admin/main.c   Fri Mar 11 21:18:15 2005 +0000
+++ b/pkgtools/pkg_install/files/admin/main.c   Fri Mar 11 21:20:15 2005 +0000
@@ -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 @@
                
                argv++;         /* "pmatch" */
 
+               if (argv[0] == NULL || argv[1] == NULL) {
+                       usage(prog);
+               }
+
                pattern = argv[0];
                pkg = argv[1];
 
-               if (pattern == NULL || pkg == NULL) {
-                       usage(prog);
-               }
-
                if (pmatch(pattern, pkg)){
                        return 0;
                } else {