From owner-svn-src-head@freebsd.org Sat Jun 2 04:32:59 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 3F533EFC7C2; Sat, 2 Jun 2018 04:32:59 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7CB7A6AFA7; Sat, 2 Jun 2018 04:32:58 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w524Ws6i084941; Fri, 1 Jun 2018 21:32:54 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w524WsNK084940; Fri, 1 Jun 2018 21:32:54 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201806020432.w524WsNK084940@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r334518 - head/usr.bin/top In-Reply-To: <201806020408.w5248r8u068839@repo.freebsd.org> To: Eitan Adler Date: Fri, 1 Jun 2018 21:32:54 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII 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:32:59 -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); Isn't it valid to run without swap and then 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); > > -- Rod Grimes rgrimes@freebsd.org