AuroraMiddleware/asio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

For UNIX domain endpoints, regular paths should be NUL-terminated, and

Browse Source 
paths in the abstract namespace should start with a NUL and not be
NUL-terminated.
This commit is contained in:
chris_kohlhoff 2008-04-20 01:28:47 +00:00
parent c1fdb669f2
commit 186c94d6c8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asio/include/asio/local/basic_endpoint.hpp
View File

@ -211,7 +211,7 @@ private:
// Initialise with a specified path. // Initialise with a specified path.
void init(const char* path, std::size_t path_length) void init(const char* path, std::size_t path_length)
{ {
if (path_length > sizeof(data_.local.sun_path)) if (path_length > sizeof(data_.local.sun_path) - 1)
{ {
// The buffer is not large enough to store this address. // The buffer is not large enough to store this address.
asio::error_code ec(asio::error::name_too_long); asio::error_code ec(asio::error::name_too_long);
@ -223,6 +223,11 @@ private:
data_.local.sun_family = AF_UNIX; data_.local.sun_family = AF_UNIX;
memcpy(data_.local.sun_path, path, path_length); memcpy(data_.local.sun_path, path, path_length);
path_length_ = path_length; path_length_ = path_length;
// NUL-terminate normal path names. Names that start with a NUL are in the
// UNIX domain protocol's "abstract namespace" and are not NUL-terminated.
if (path_length > 0 && data_.local.sun_path[0] == 0)
data_.local.sun_path[path_length] = 0;
} }
}; };