From 691912aa9065d263530213aa2d729a9566f7c795 Mon Sep 17 00:00:00 2001 From: kamaljeet Date: Wed, 6 Jun 2018 18:13:26 +0530 Subject: [PATCH] Fix for ASAN Issues(alloc-dealloc mismatch) Change-Id: I97dd2344b21c01a5acb9133e6520f69d0aec84f0 Signed-off-by: kamaljeet --- src/shared/message.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/shared/message.cpp b/src/shared/message.cpp index d7455eb..e232ee4 100644 --- a/src/shared/message.cpp +++ b/src/shared/message.cpp @@ -21,6 +21,8 @@ #include #include +#include + using namespace ipc; @@ -31,7 +33,7 @@ static std::atomic sequence(0); message::message(size_t capacity) : m_size(0) , m_capacity(capacity) -, m_msg((char *)malloc(sizeof(char) * capacity)) +, m_msg(new(std::nothrow) char[sizeof(char) *capacity]) , ref_cnt(0) { m_header.id = sequence++; @@ -55,7 +57,7 @@ message::message(const void *msg, size_t sz) message::message(const message &msg) : m_size(msg.m_size) , m_capacity(msg.m_capacity) -, m_msg((char *)malloc(sizeof(char) * msg.m_capacity)) +, m_msg(new(std::nothrow) char[(sizeof(char) * msg.m_capacity)]) , ref_cnt(0) { ::memcpy(&m_header, &msg.m_header, sizeof(message_header)); @@ -77,7 +79,7 @@ message::message(int error) message::~message() { if (m_msg && ref_cnt == 0) { - free(m_msg); + delete [] m_msg; m_msg = NULL; } } -- 2.7.4