From owner-p4-projects@FreeBSD.ORG  Thu Aug 13 08:12:03 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D87021065672; Thu, 13 Aug 2009 08:12:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 984A0106566C
	for <perforce@FreeBSD.org>; Thu, 13 Aug 2009 08:12:02 +0000 (UTC)
	(envelope-from dforsyth@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 877368FC41
	for <perforce@FreeBSD.org>; Thu, 13 Aug 2009 08:12:02 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7D8C2X3038917
	for <perforce@FreeBSD.org>; Thu, 13 Aug 2009 08:12:02 GMT
	(envelope-from dforsyth@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7D8C2V2038915
	for perforce@freebsd.org; Thu, 13 Aug 2009 08:12:02 GMT
	(envelope-from dforsyth@FreeBSD.org)
Date: Thu, 13 Aug 2009 08:12:02 GMT
Message-Id: <200908130812.n7D8C2V2038915@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	dforsyth@FreeBSD.org using -f
From: David Forsythe <dforsyth@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 167273 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Aug 2009 08:12:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=167273

Change 167273 by dforsyth@squirrel on 2009/08/13 08:11:31

	Whoops.  Fix element checks on NULL.

Affected files ...

.. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#31 edit

Differences ...

==== //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#31 (text+ko) ====

@@ -329,17 +329,23 @@
 		printf("\tComment: PKG_FORMAT_REVISION:%s\n", pkg_format_revision(p));
 		printf("\tPackage name: %s\n", pkg_name(p));
 		printf("\tPackage origin: %s\n", pkg_origin(p));
-
-		for (klist = pkg_depends(p); klist != NULL && *klist != NULL; block_text = *klist++)
-			printf("Dependency: %s\n\tdependency origin: %s\n", 
-				block_text, pkg_pkg_depend_origin(p, block_text));
+	
+		klist = pkg_depends(p);
+		if (klist != NULL) {
+			for (buff = *klist++; *klist != NULL; buff = *klist++)
+				printf("Dependency: %s\n\tdependency origin: %s\n", 
+					buff, pkg_pkg_depend_origin(p, buff));
+		}
 		
 		block_text = NULL;
-		for (klist = pkg_files(p); klist != NULL && *klist != NULL; buff = *klist++) {
-			if (block_text == NULL || strcmp(block_text, pkg_pkg_file_cwd(p, buff)) != 0)
-				printf("\tCWD to %s\n", block_text = pkg_pkg_file_cwd(p, buff));
-			printf("File: %s\n\tComment: MD5: %s\n", 
-				buff, pkg_pkg_file_md5(p, buff));
+		klist = pkg_files(p);
+		if (klist != NULL) {
+			for (buff = *klist++; *klist != NULL; buff = *klist++) {
+				if (block_text == NULL || strcmp(block_text, pkg_pkg_file_cwd(p, buff)) != 0)
+					printf("\tCWD to %s\n", block_text = pkg_pkg_file_cwd(p, buff));
+				printf("File: %s\n\tComment: MD5: %s\n", 
+					buff, pkg_pkg_file_md5(p, buff));
+			}
 		}
 
 		for (klist = pkg_execs(p); klist != NULL && *klist != NULL; buff = *klist++)