From owner-svn-src-all@freebsd.org Sat May 14 23:42:37 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 031C4B3B2C5; Sat, 14 May 2016 23:42:37 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail105.syd.optusnet.com.au (mail105.syd.optusnet.com.au [211.29.132.249]) by mx1.freebsd.org (Postfix) with ESMTP id C236F1798; Sat, 14 May 2016 23:42:36 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c122-106-149-109.carlnfd1.nsw.optusnet.com.au (c122-106-149-109.carlnfd1.nsw.optusnet.com.au [122.106.149.109]) by mail105.syd.optusnet.com.au (Postfix) with ESMTPS id BE1571040084; Sun, 15 May 2016 09:42:25 +1000 (AEST) Date: Sun, 15 May 2016 09:42:24 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Garrett Cooper cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r299770 - head/usr.sbin/bsnmpd/tools/libbsnmptools In-Reply-To: <201605142243.u4EMh75e071378@repo.freebsd.org> Message-ID: <20160515093254.R2601@besplex.bde.org> References: <201605142243.u4EMh75e071378@repo.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=EfU1O6SC c=1 sm=1 tr=0 a=R/f3m204ZbWUO/0rwPSMPw==:117 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=kj9zAlcOel0A:10 a=9thJgSn-OPGUY6-yH80A:9 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 May 2016 23:42:37 -0000 On Sat, 14 May 2016, Garrett Cooper wrote: > Log: > Fix up r299764 > > I meant to use nitems, not sizeof(..) with the destination buffer. Using sizeof(..) > on a pointer will always truncate the output in the destination buffer incorrectly > > Pointyhat to: ngie Er, this is pointier than before. nitems() is only valid on arrays. > Modified: head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c > ============================================================================== > --- head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Sat May 14 22:40:35 2016 (r299769) > +++ head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Sat May 14 22:43:07 2016 (r299770) > @@ -264,7 +264,7 @@ add_filename(struct snmp_toolinfo *snmpt > > if (cut != NULL) > asn_append_oid(&(entry->cut), cut); > - strlcpy(fstring, filename, sizeof(fstring)); > + strlcpy(fstring, filename, nitems(fstring)); fstring is pointer to char, so nitems(fstring) = sizeof(char *) / 1 sizeof(char *) = accidentally the same wrong value as before. The old code using strlen() had a chance of being correct. Bruce