From owner-svn-src-stable@FreeBSD.ORG  Mon Jun  8 22:05:48 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 213A4106566C;
	Mon,  8 Jun 2009 22:05:48 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E4908FC1E;
	Mon,  8 Jun 2009 22:05:48 +0000 (UTC)
	(envelope-from jilles@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 n58M5lgb045759;
	Mon, 8 Jun 2009 22:05:47 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58M5lTc045758;
	Mon, 8 Jun 2009 22:05:47 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <200906082205.n58M5lTc045758@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Mon, 8 Jun 2009 22:05:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193776 - in stable/7/usr.sbin/pkg_install: . info
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 22:05:49 -0000

Author: jilles
Date: Mon Jun  8 22:05:47 2009
New Revision: 193776
URL: http://svn.freebsd.org/changeset/base/193776

Log:
  MFC r193273: Fix segfault when giving invalid long option to pkg_info.
  
  PR:		bin/133473
  Submitted by:	Rafal Grodzinski
  Approved by:	ed (mentor)

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

Modified: stable/7/usr.sbin/pkg_install/info/main.c
==============================================================================
--- stable/7/usr.sbin/pkg_install/info/main.c	Mon Jun  8 22:03:37 2009	(r193775)
+++ stable/7/usr.sbin/pkg_install/info/main.c	Mon Jun  8 22:05:47 2009	(r193776)
@@ -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