project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

malloc_conf_init: revert errno value when readlink(2) fail.

Browse Source
This commit is contained in:
Alexandre Perrin 2013-09-20 19:58:11 +02:00 committed by Jason Evans
parent a33488d648
commit dd6ef0302f
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/jemalloc.c
View File

@ -436,8 +436,9 @@ malloc_conf_init(void)
} }
break; break;
case 1: { case 1: {
int linklen = 0;
#ifndef _WIN32 #ifndef _WIN32
int linklen; int saved_errno = errno;
const char *linkname = const char *linkname =
# ifdef JEMALLOC_PREFIX # ifdef JEMALLOC_PREFIX
"/etc/"JEMALLOC_PREFIX"malloc.conf" "/etc/"JEMALLOC_PREFIX"malloc.conf"
@ -446,21 +447,20 @@ malloc_conf_init(void)
# endif # endif
; ;
if ((linklen = readlink(linkname, buf, /*
sizeof(buf) - 1)) != -1) { * Try to use the contents of the "/etc/malloc.conf"
/* * symbolic link's name.
* Use the contents of the "/etc/malloc.conf" */
* symbolic link's name. linklen = readlink(linkname, buf, sizeof(buf) - 1);
*/ if (linklen == -1) {
buf[linklen] = '\0';
opts = buf;
} else
#endif
{
/* No configuration specified. */ /* No configuration specified. */
buf[0] = '\0'; linklen = 0;
opts = buf; /* restore errno */
set_errno(saved_errno);
} }
#endif
buf[linklen] = '\0';
opts = buf;
break; break;
} case 2: { } case 2: {
const char *envname = const char *envname =