mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

HOST_NAME_MAX and LOGIN_NAME_MAX availability is not consistent across linux/android/macos platforms. However all of them do have versions of these macros with _POSIX_ prefix.

Browse Source 
In addition to that hostname and user variables may be uninitialized in some configurations, however they are always used. Initializing these arrays fixes conditional depending on uninitialized memory warning uncovered by valgrind.
This commit is contained in:
Rokas Kupstys 2018-12-18 17:10:39 +02:00
parent 083320820f
commit a931b9eaf1
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/TracyProfiler.cpp
View File

@ -289,17 +289,10 @@ static const char* GetHostInfo()
ptr += sprintf( ptr, "User: %s@%s\n", user, hostname );
#else
# ifndef HOST_NAME_MAX
const size_t HOST_NAME_MAX = 1024u;
# endif
# ifndef LOGIN_NAME_MAX
const size_t LOGIN_NAME_MAX = 1024u;
# endif
char hostname[_POSIX_HOST_NAME_MAX]{};
char user[_POSIX_LOGIN_NAME_MAX]{};
char hostname[HOST_NAME_MAX];
char user[LOGIN_NAME_MAX];
gethostname( hostname, HOST_NAME_MAX );
gethostname( hostname, _POSIX_HOST_NAME_MAX );
# if defined __ANDROID__
const auto login = getlogin();
if( login )
@ -311,7 +304,7 @@ static const char* GetHostInfo()
memcpy( user, "(?)", 4 );
}
# else
getlogin_r( user, LOGIN_NAME_MAX );
getlogin_r( user, _POSIX_LOGIN_NAME_MAX );
# endif
ptr += sprintf( ptr, "User: %s@%s\n", user, hostname );