From owner-svn-src-user@FreeBSD.ORG Thu Jun 11 05:42:37 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 19FC8106566B;
Thu, 11 Jun 2009 05:42:37 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 08CC08FC19;
Thu, 11 Jun 2009 05:42:37 +0000 (UTC)
(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5B5gaI8036793;
Thu, 11 Jun 2009 05:42:36 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5B5galc036792;
Thu, 11 Jun 2009 05:42:36 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906110542.n5B5galc036792@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 11 Jun 2009 05:42:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r193970 - user/kmacy/releng_7_2_xen/sys/xen/xenbus
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2009 05:42:37 -0000
Author: kmacy
Date: Thu Jun 11 05:42:36 2009
New Revision: 193970
URL: http://svn.freebsd.org/changeset/base/193970
Log:
check message callback for null
Modified:
user/kmacy/releng_7_2_xen/sys/xen/xenbus/xenbus_xs.c
Modified: user/kmacy/releng_7_2_xen/sys/xen/xenbus/xenbus_xs.c
==============================================================================
--- user/kmacy/releng_7_2_xen/sys/xen/xenbus/xenbus_xs.c Thu Jun 11 05:36:49 2009 (r193969)
+++ user/kmacy/releng_7_2_xen/sys/xen/xenbus/xenbus_xs.c Thu Jun 11 05:42:36 2009 (r193970)
@@ -769,7 +769,7 @@ xenwatch_thread(void *unused)
TAILQ_REMOVE(&watch_events, msg, list);
mtx_unlock(&watch_events_lock);
- if (msg != NULL) {
+ if (msg != NULL && msg->u.watch.handle->callback != NULL) {
msg->u.watch.handle->callback(
msg->u.watch.handle,
(const char **)msg->u.watch.vec,