From 8327c8091f33f245f3d1a45b21f9b2b8243a141d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 21 Feb 2008 16:15:00 +0000 Subject: [PATCH] team::parent is NULL in case of the kernel - Expander crashed reliably when expanding something with it. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24047 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/team.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp index 8f77b1cb12..2a833bda4d 100644 --- a/src/system/kernel/team.cpp +++ b/src/system/kernel/team.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007, Axel Dörfler, axeld@pinc-software.de. + * Copyright 2002-2008, Axel Dörfler, axeld@pinc-software.de. * Distributed under the terms of the MIT License. * * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. @@ -1774,7 +1774,8 @@ update_orphaned_process_group(process_group* group, pid_t dyingProcess) struct team* team = group->teams; while (team != NULL) { struct team* parent = team->parent; - if (team->id != dyingProcess && parent->id != dyingProcess + if (team->id != dyingProcess && parent != NULL + && parent->id != dyingProcess && parent->group_id != group->id && parent->session_id == group->session->id) { return false;