oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

net/Resolver: relax size check in LocalAddressToString()

Browse Source 
Handles abstract sockets on Linux.
This commit is contained in:
Max Kellermann 2015-02-10 22:46:57 +01:00
parent cf5c10bbe6
commit 6e66a5b77b
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/net/Resolver.cxx
View File

@ -23,6 +23,8 @@
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include <algorithm>
#ifndef WIN32
#include <sys/socket.h>
#include <netdb.h>
@ -48,10 +50,26 @@ const Domain resolver_domain("resolver");
static std::string
LocalAddressToString(const struct sockaddr_un &s_un, size_t size)
{
if (size < sizeof(s_un) || s_un.sun_path[0] == 0)
const size_t prefix_size = (size_t)
((struct sockaddr_un *)nullptr)->sun_path;
assert(size >= prefix_size);
size_t result_length = size - prefix_size;
/* remove the trailing null terminator */
if (result_length > 0 && s_un.sun_path[result_length - 1] == 0)
--result_length;
if (result_length == 0)
return "local";
return s_un.sun_path;
std::string result(s_un.sun_path, result_length);
/* replace all null bytes with '@'; this also handles abstract
addresses (Linux specific) */
std::replace(result.begin(), result.end(), '\0', '@');
return result;
}
#endif