i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel team.cpp: fix unbalanced io_context ref management

Browse Source 
... in case of team creation error. Once assigned to Team::io_context
the Team object takes responsibility of the I/O context object and
releases the reference on destruction. load_image_internal() and
fork_team() were thus releasing one reference too many.

Fixes #9851.
This commit is contained in:
Ingo Weinhold
2013-07-02 01:57:30 +02:00
parent a97ff1bb60
commit cbcde3ba80
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/team.cpp
+4 -7
View File
@@ -503,7 +503,8 @@ Team::~Team()
// get rid of all associated data // get rid of all associated data
PrepareForDeletion(); PrepareForDeletion();
vfs_put_io_context(io_context); if (io_context != NULL)
vfs_put_io_context(io_context);
delete_owned_ports(this); delete_owned_ports(this);
sem_delete_owned_sems(this); sem_delete_owned_sems(this);
@@ -1752,7 +1753,7 @@ load_image_internal(char**& _flatArgs, size_t flatArgsSize, int32 argCount,
status = VMAddressSpace::Create(team->id, USER_BASE, USER_SIZE, false, status = VMAddressSpace::Create(team->id, USER_BASE, USER_SIZE, false,
&team->address_space); &team->address_space);
if (status != B_OK) if (status != B_OK)
goto err3; goto err2;
// create the user data area // create the user data area
status = create_team_user_data(team); status = create_team_user_data(team);
@@ -1814,8 +1815,6 @@ err5:
delete_team_user_data(team); delete_team_user_data(team);
err4: err4:
team->address_space->Put(); team->address_space->Put();
err3:
vfs_put_io_context(team->io_context);
err2: err2:
free_team_arg(teamArgs); free_team_arg(teamArgs);
err1: err1:
@@ -2075,7 +2074,7 @@ fork_team(void)
parentTeam->realtime_sem_context); parentTeam->realtime_sem_context);
if (team->realtime_sem_context == NULL) { if (team->realtime_sem_context == NULL) {
status = B_NO_MEMORY; status = B_NO_MEMORY;
goto err25; goto err2;
} }
} }
@@ -2170,8 +2169,6 @@ err4:
team->address_space->RemoveAndPut(); team->address_space->RemoveAndPut();
err3: err3:
delete_realtime_sem_context(team->realtime_sem_context); delete_realtime_sem_context(team->realtime_sem_context);
err25:
vfs_put_io_context(team->io_context);
err2: err2:
free(forkArgs); free(forkArgs);
err1: err1: