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

libc: never destruct the file-descriptor allocator

Browse Source 
This patch prevents the destruction of the fd allocator when the program
exists. Otherwise, the meta data for file descriptors that were not
manually closed would vanish, which may cause problems in subsequent
destructors.
This commit is contained in:
Norman Feske 2016-04-05 19:08:25 +02:00 committed by Christian Helmuth
parent 8971bb25ce
commit 329ab80d1d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
repos/libports/src/lib/libc/fd_alloc.cc
View File

@ -13,6 +13,7 @@
*/
/* Genode includes */
#include <util/construct_at.h>
#include <base/env.h>
#include <base/printf.h>
@ -23,8 +24,14 @@ namespace Libc {
File_descriptor_allocator *file_descriptor_allocator()
{
static File_descriptor_allocator _file_descriptor_allocator;
return &_file_descriptor_allocator;
static bool constructed = 0;
static char placeholder[sizeof(File_descriptor_allocator)];
if (!constructed) {
Genode::construct_at<File_descriptor_allocator>(placeholder);
constructed = 1;
}
return reinterpret_cast<File_descriptor_allocator *>(placeholder);
}
}