Date: Wed, 3 Feb 2016 01:58:38 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r295187 - user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools Message-ID: <201602030158.u131wcru051804@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Feb 3 01:58:37 2016 New Revision: 295187 URL: https://svnweb.freebsd.org/changeset/base/295187 Log: Use nitems(string) instead of strlen(nexttok) + 1 to mute a valid security concern with strlcpy related to the source/destination buffer sizes (-Wstrlcpy-strlcat-size) Reported by: Jenkins (clang job) Sponsored by: EMC / Isilon Storage Division Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Modified: user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c ============================================================================== --- user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Wed Feb 3 01:50:27 2016 (r295186) +++ user/ngie/bsnmp_cleanup/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Wed Feb 3 01:58:37 2016 (r295187) @@ -775,7 +775,7 @@ snmp_import_object(struct snmp_toolinfo } memset(oid2str, 0, sizeof(struct snmp_oid2str)); - strlcpy(string, nexttok, strlen(nexttok) + 1); + strlcpy(string, nexttok, nitems(string)); oid2str->string = string; oid2str->strlen = strlen(nexttok);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602030158.u131wcru051804>