ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libc_lock_pipe: match alloc. and dealloc. funcs 

Fixes #460.
This commit is contained in:
Christian Prochaska 2012-11-01 21:41:31 +01:00 committed by Norman Feske
parent abf3867d39
commit d46c79b428
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libports/src/lib/libc_lock_pipe/plugin.cc
View File

@ -142,15 +142,13 @@ namespace {
}
Genode::memset(_buffer, 0, PIPE_BUF_SIZE);
_lock_state = (Genode::Cancelable_lock::State*)
malloc(sizeof(Genode::Cancelable_lock::State));
_lock_state = new (Genode::env()->heap())
Genode::Cancelable_lock::State(Genode::Lock::LOCKED);
if (!_lock_state) {
PERR("pipe lock_state allocation failed");
}
*_lock_state = Genode::Lock::LOCKED;
_lock = new (Genode::env()->heap()) Genode::Lock(*_lock_state);
if (!_lock) {
PERR("pipe lock allocation failed");
@ -173,7 +171,7 @@ namespace {
context(_partner)->set_partner(0);
} else {
/* partner fd is already destroyed -> free shared resources */
destroy(Genode::env()->heap(), _buffer);
free(_buffer);
destroy(Genode::env()->heap(), _lock);
destroy(Genode::env()->heap(), _lock_state);
}