From owner-svn-src-all@FreeBSD.ORG Tue Jun 5 20:09:00 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A612B106564A; Tue, 5 Jun 2012 20:09:00 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 333AA8FC20; Tue, 5 Jun 2012 20:09:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q55K90Ii041277; Tue, 5 Jun 2012 20:09:00 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q55K908g041275; Tue, 5 Jun 2012 20:09:00 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201206052009.q55K908g041275@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 5 Jun 2012 20:08:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r236634 - head/usr.sbin/pmcstat X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 05 Jun 2012 20:09:00 -0000 Author: glebius Date: Tue Jun 5 20:08:59 2012 New Revision: 236634 URL: http://svn.freebsd.org/changeset/base/236634 Log: Don't crash trying to load symbols from striped file. PR: bin/167361 Submitted by: Slawa Olhovchenkov Silence from: jkoshy Modified: head/usr.sbin/pmcstat/pmcstat_log.c Modified: head/usr.sbin/pmcstat/pmcstat_log.c ============================================================================== --- head/usr.sbin/pmcstat/pmcstat_log.c Tue Jun 5 19:59:09 2012 (r236633) +++ head/usr.sbin/pmcstat/pmcstat_log.c Tue Jun 5 20:08:59 2012 (r236634) @@ -564,6 +564,8 @@ pmcstat_image_add_symbols(struct pmcstat } image->pi_symcount += newsyms; + if (image->pi_symcount == 0) + return; assert(newsyms <= nfuncsyms);