From owner-svn-src-head@freebsd.org Sat Jun 2 04:08:53 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DBE77EF9672; Sat, 2 Jun 2018 04:08:53 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C6046980E; Sat, 2 Jun 2018 04:08:53 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D67E2665; Sat, 2 Jun 2018 04:08:53 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5248rL0068841; Sat, 2 Jun 2018 04:08:53 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5248r8u068839; Sat, 2 Jun 2018 04:08:53 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201806020408.w5248r8u068839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 2 Jun 2018 04:08:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334518 - head/usr.bin/top X-SVN-Group: head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/usr.bin/top X-SVN-Commit-Revision: 334518 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2018 04:08:54 -0000 Author: eadler Date: Sat Jun 2 04:08:52 2018 New Revision: 334518 URL: https://svnweb.freebsd.org/changeset/base/334518 Log: top(1): help scan-build along a bit Teach scan-build that some arrays are larger than zero, and thus not to warn. Modified: head/usr.bin/top/display.c head/usr.bin/top/machine.c Modified: head/usr.bin/top/display.c ============================================================================== --- head/usr.bin/top/display.c Sat Jun 2 03:54:50 2018 (r334517) +++ head/usr.bin/top/display.c Sat Jun 2 04:08:52 2018 (r334518) @@ -30,6 +30,7 @@ #include +#include #include #include #include @@ -203,19 +204,23 @@ int display_init(struct statics * statics) /* save pointers and allocate space for names */ procstate_names = statics->procstate_names; num_procstates = string_count(procstate_names); + assert(num_procstates > 0); lprocstates = malloc(num_procstates * sizeof(int)); cpustate_names = statics->cpustate_names; swap_names = statics->swap_names; num_swap = string_count(swap_names); + assert(num_swap > 0); lswap = malloc(num_swap * sizeof(int)); num_cpustates = string_count(cpustate_names); + assert(num_cpustates > 0); lcpustates = malloc(num_cpustates * sizeof(int) * statics->ncpus); cpustate_columns = malloc(num_cpustates * sizeof(int)); memory_names = statics->memory_names; num_memory = string_count(memory_names); + assert(num_memory > 0); lmemory = malloc(num_memory * sizeof(int)); arc_names = statics->arc_names; Modified: head/usr.bin/top/machine.c ============================================================================== --- head/usr.bin/top/machine.c Sat Jun 2 03:54:50 2018 (r334517) +++ head/usr.bin/top/machine.c Sat Jun 2 04:08:52 2018 (r334518) @@ -401,6 +401,7 @@ machine_init(struct statics *statics) } } size = sizeof(long) * ncpus * CPUSTATES; + assert(size > 0); pcpu_cp_old = calloc(1, size); pcpu_cp_diff = calloc(1, size); pcpu_cpu_states = calloc(1, size);