From owner-svn-src-all@FreeBSD.ORG Tue Aug 3 11:21:18 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4990C106566B; Tue, 3 Aug 2010 11:21:18 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 38F4E8FC0C; Tue, 3 Aug 2010 11:21:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o73BLIKl028585; Tue, 3 Aug 2010 11:21:18 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o73BLIEL028583; Tue, 3 Aug 2010 11:21:18 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201008031121.o73BLIEL028583@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Tue, 3 Aug 2010 11:21:18 +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: r210795 - head/sys/geom/sched 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, 03 Aug 2010 11:21:18 -0000 Author: ae Date: Tue Aug 3 11:21:17 2010 New Revision: 210795 URL: http://svn.freebsd.org/changeset/base/210795 Log: Check that gsp is not NULL before access. It can be NULL for some cases. Approved by: kib (mentor) MFC after: 1 week Modified: head/sys/geom/sched/g_sched.c Modified: head/sys/geom/sched/g_sched.c ============================================================================== --- head/sys/geom/sched/g_sched.c Tue Aug 3 09:23:53 2010 (r210794) +++ head/sys/geom/sched/g_sched.c Tue Aug 3 11:21:17 2010 (r210795) @@ -1906,7 +1906,7 @@ g_sched_dumpconf(struct sbuf *sb, const if (indent == NULL) { /* plaintext */ sbuf_printf(sb, " algo %s", gsp ? gsp->gs_name : "--"); } - if (gsp->gs_dumpconf) + if (gsp != NULL && gsp->gs_dumpconf) gsp->gs_dumpconf(sb, indent, gp, cp, pp); }