From owner-svn-src-all@FreeBSD.ORG  Wed Jun 17 02:52:35 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A53E6106566B;
	Wed, 17 Jun 2009 02:52:35 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 929618FC15;
	Wed, 17 Jun 2009 02:52:35 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5H2qZut059932;
	Wed, 17 Jun 2009 02:52:35 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5H2qZvF059930;
	Wed, 17 Jun 2009 02:52:35 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200906170252.n5H2qZvF059930@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 17 Jun 2009 02:52:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194320 - in stable/6/usr.sbin/pkg_install: . info
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2009 02:52:36 -0000

Author: emaste
Date: Wed Jun 17 02:52:35 2009
New Revision: 194320
URL: http://svn.freebsd.org/changeset/base/194320

Log:
  MFC r193273 by jilles:
  
    Fix segfault when giving invalid long option to pkg_info.
  
  PR: bin/133473
  Submitted by: Rafal Grodzinski

Modified:
  stable/6/usr.sbin/pkg_install/   (props changed)
  stable/6/usr.sbin/pkg_install/info/main.c

Modified: stable/6/usr.sbin/pkg_install/info/main.c
==============================================================================
--- stable/6/usr.sbin/pkg_install/info/main.c	Wed Jun 17 02:51:16 2009	(r194319)
+++ stable/6/usr.sbin/pkg_install/info/main.c	Wed Jun 17 02:52:35 2009	(r194320)
@@ -58,6 +58,7 @@ static struct option longopts[] = {
 	{ "verbose",	no_argument,		NULL,		'v' },
 	{ "version",	no_argument,		NULL,		'P' },
 	{ "which",	required_argument,	NULL,		'W' },
+	{ NULL,		0,			NULL,		0 }
 };
 
 int