Replaced strncpy with memcpy (#684)
* Replaced strncpy with memcpy Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
This commit is contained in:
parent
ed21cf4699
commit
af9ae4a61c
1 changed files with 15 additions and 2 deletions
|
@ -25,6 +25,7 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <set>
|
#include <set>
|
||||||
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
@ -283,9 +284,21 @@ private:
|
||||||
fixed_size_string(const char * str) const
|
fixed_size_string(const char * str) const
|
||||||
{
|
{
|
||||||
FixedSizeString ret;
|
FixedSizeString ret;
|
||||||
std::strncpy(ret.data(), str, ret.size());
|
size_t size = std::strlen(str) + 1;
|
||||||
|
if (size > ret.size()) {
|
||||||
|
throw std::runtime_error("failed to copy topic name");
|
||||||
|
}
|
||||||
|
std::memcpy(ret.data(), str, size);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
struct strcmp_wrapper
|
||||||
|
{
|
||||||
|
bool
|
||||||
|
operator()(const FixedSizeString lhs, const FixedSizeString rhs) const
|
||||||
|
{
|
||||||
|
return std::strcmp(lhs.data(), rhs.data()) < 0;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
using RebindAlloc = typename std::allocator_traits<Allocator>::template rebind_alloc<T>;
|
using RebindAlloc = typename std::allocator_traits<Allocator>::template rebind_alloc<T>;
|
||||||
|
@ -301,7 +314,7 @@ private:
|
||||||
using IDTopicMap = std::map<
|
using IDTopicMap = std::map<
|
||||||
FixedSizeString,
|
FixedSizeString,
|
||||||
AllocSet,
|
AllocSet,
|
||||||
std::less<FixedSizeString>,
|
strcmp_wrapper,
|
||||||
RebindAlloc<std::pair<const FixedSizeString, AllocSet>>>;
|
RebindAlloc<std::pair<const FixedSizeString, AllocSet>>>;
|
||||||
|
|
||||||
SubscriptionMap subscriptions_;
|
SubscriptionMap subscriptions_;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue