From owner-svn-src-projects@FreeBSD.ORG Thu Jan 10 04:51:08 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2F5E5418; Thu, 10 Jan 2013 04:51:08 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F3DCC251; Thu, 10 Jan 2013 04:51:07 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0A4p7tg057400; Thu, 10 Jan 2013 04:51:07 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0A4p7DG057399; Thu, 10 Jan 2013 04:51:07 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201301100451.r0A4p7DG057399@svn.freebsd.org> From: Lawrence Stewart Date: Thu, 10 Jan 2013 04:51:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245246 - projects/diffused_head/sbin/ipfw X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2013 04:51:08 -0000 Author: lstewart Date: Thu Jan 10 04:51:07 2013 New Revision: 245246 URL: http://svnweb.freebsd.org/changeset/base/245246 Log: Fix a few bugs discovered by clang related to string handling of action parameters. Modified: projects/diffused_head/sbin/ipfw/diffuse_ui.c Modified: projects/diffused_head/sbin/ipfw/diffuse_ui.c ============================================================================== --- projects/diffused_head/sbin/ipfw/diffuse_ui.c Thu Jan 10 04:41:04 2013 (r245245) +++ projects/diffused_head/sbin/ipfw/diffuse_ui.c Thu Jan 10 04:51:07 2013 (r245246) @@ -1378,14 +1378,14 @@ export_config(int ac, char **av) case TOK_DI_EXP_ACTION_PARAMS: NEED(exp, "action-param is only for export config"); NEED1("action-param must be specified"); - if (strlen(*av) > DI_MAX_NAME_STR_LEN - 1) { + if (strlen(*av) > DI_MAX_PARAM_STR_LEN - 1) { errx(EX_DATAERR, "action-param cannot be " "longer than %d chars", - DI_MAX_NAME_STR_LEN - 1); + DI_MAX_PARAM_STR_LEN - 1); } strncpy(exp->conf.action_param, *av, DI_MAX_PARAM_STR_LEN - 1); - exp->conf.action[DI_MAX_PARAM_STR_LEN - 1] = '\0'; + exp->conf.action_param[DI_MAX_PARAM_STR_LEN - 1] = '\0'; ac--; av++; break;