tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Staticlly allocate string buffers for realpath_fd()" am: 424eb11e43

Browse source 
am: ff6fbebec8

Change-Id: I667d64073c1f2c823ee39e53f59a672f27313527
This commit is contained in:
Vic Yang 2019-05-30 03:59:57 -07:00 committed by android-build-merger
commit d745073649
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
linker/linker.cpp
View file

@ -393,16 +393,23 @@ static void parse_LD_LIBRARY_PATH(const char* path) {
}
static bool realpath_fd(int fd, std::string* realpath) {
std::vector<char> buf(PATH_MAX), proc_self_fd(PATH_MAX);
async_safe_format_buffer(&proc_self_fd[0], proc_self_fd.size(), "/proc/self/fd/%d", fd);
if (readlink(&proc_self_fd[0], &buf[0], buf.size()) == -1) {
// proc_self_fd needs to be large enough to hold "/proc/self/fd/" plus an
// integer, plus the NULL terminator.
char proc_self_fd[32];
// We want to statically allocate this large buffer so that we don't grow
// the stack by too much.
static char buf[PATH_MAX];
async_safe_format_buffer(proc_self_fd, sizeof(proc_self_fd), "/proc/self/fd/%d", fd);
auto length = readlink(proc_self_fd, buf, sizeof(buf));
if (length == -1) {
if (!is_first_stage_init()) {
PRINT("readlink(\"%s\") failed: %s [fd=%d]", &proc_self_fd[0], strerror(errno), fd);
PRINT("readlink(\"%s\") failed: %s [fd=%d]", proc_self_fd, strerror(errno), fd);
}
return false;
}
*realpath = &buf[0];
realpath->assign(buf, length);
return true;
}