===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pctr/pctr.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/pctr/pctr.c	2015/02/08 23:40:34	1.22
--- src/usr.bin/pctr/pctr.c	2017/09/10 11:30:43	1.23
***************
*** 1,4 ****
! /*	$OpenBSD: pctr.c,v 1.22 2015/02/08 23:40:34 deraadt Exp $	*/
  
  /*
   * Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev
--- 1,4 ----
! /*	$OpenBSD: pctr.c,v 1.23 2017/09/10 11:30:43 tom Exp $	*/
  
  /*
   * Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev
***************
*** 165,175 ****
  	/* Get the architecture */
  	mib[0] = CTL_HW;
  	mib[1] = HW_MACHINE;
! 	len = sizeof(arch) - 1;
! 	bzero(arch, sizeof(arch));
  	if (sysctl(mib, 2, arch, &len, NULL, 0) == -1)
  		err(1, "HW_MACHINE");
- 	arch[len] = '\0';
  
  	if (strcmp(arch, "i386") == 0)
  		atype = ARCH_I386;
--- 165,173 ----
  	/* Get the architecture */
  	mib[0] = CTL_HW;
  	mib[1] = HW_MACHINE;
! 	len = sizeof(arch);
  	if (sysctl(mib, 2, arch, &len, NULL, 0) == -1)
  		err(1, "HW_MACHINE");
  
  	if (strcmp(arch, "i386") == 0)
  		atype = ARCH_I386;
***************
*** 194,204 ****
  	/* Get the processor vendor */
  	mib[0] = CTL_MACHDEP;
  	mib[1] = CPU_CPUVENDOR;
! 	len = sizeof(vendor) - 1;
! 	bzero(vendor, sizeof(vendor));
  	if (sysctl(mib, 2, vendor, &len, NULL, 0) == -1)
  		err(1, "CPU_CPUVENDOR");
- 	vendor[len] = '\0';
  
  	switch (atype) {
  	case ARCH_I386:
--- 192,200 ----
  	/* Get the processor vendor */
  	mib[0] = CTL_MACHDEP;
  	mib[1] = CPU_CPUVENDOR;
! 	len = sizeof(vendor);
  	if (sysctl(mib, 2, vendor, &len, NULL, 0) == -1)
  		err(1, "CPU_CPUVENDOR");
  
  	switch (atype) {
  	case ARCH_I386: