generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-12 10:28:31 +01:00
Code Issues Projects Releases Wiki Activity

Problem: use of unnecessary complex stringstream

Browse Source 
Solution: use memcpy instead
This commit is contained in:
Simon Giesecke 2019-02-06 10:14:04 +01:00 committed by Simon Giesecke
parent 19c6aa5c92
commit 808028fe02
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ipc_address.cpp
View File

@ -36,7 +36,6 @@
#include "err.hpp" #include "err.hpp"
#include <string> #include <string>
#include <sstream>
zmq::ipc_address_t::ipc_address_t () zmq::ipc_address_t::ipc_address_t ()
{ {
@ -58,7 +57,8 @@ zmq::ipc_address_t::~ipc_address_t ()
int zmq::ipc_address_t::resolve (const char *path_) int zmq::ipc_address_t::resolve (const char *path_)
{ {
if (strlen (path_) >= sizeof address.sun_path) { const size_t path_len = strlen (path_);
if (path_len >= sizeof address.sun_path) {
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
return -1; return -1;
} }
@ -68,7 +68,7 @@ int zmq::ipc_address_t::resolve (const char *path_)
} }
address.sun_family = AF_UNIX; address.sun_family = AF_UNIX;
strcpy (address.sun_path, path_); memcpy (address.sun_path, path_, path_len + 1);
/* Abstract sockets start with '\0' */ /* Abstract sockets start with '\0' */
if (path_[0] == '@') if (path_[0] == '@')
*address.sun_path = '\0'; *address.sun_path = '\0';
@ -82,13 +82,24 @@ int zmq::ipc_address_t::to_string (std::string &addr_) const
return -1; return -1;
} }
std::stringstream s; const char prefix[] = "ipc://";
s << "ipc://"; char buf[sizeof prefix + sizeof address.sun_path];
if (!address.sun_path[0] && address.sun_path[1]) char *pos = buf;
s << "@" << address.sun_path + 1; memcpy (pos, prefix, sizeof prefix - 1);
else pos += sizeof prefix - 1;
s << address.sun_path; const char *src_pos = address.sun_path;
addr_ = s.str (); if (!address.sun_path[0] && address.sun_path[1]) {
*pos++ = '@';
src_pos++;
}
// TODO
// according to http://man7.org/linux/man-pages/man7/unix.7.html, NOTES
// section, address.sun_path might not always be null-terminated; instead,
// we must store the sa_len_ passed in the ctor to calculate the actual
// length
const size_t src_len = strlen (src_pos);
memcpy (pos, src_pos, src_len + 1);
addr_.assign (pos, buf, pos - buf + src_len);
return 0; return 0;
} }