X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmessaging%2Fmessage.cpp;h=a8b80895d962cb311095ec05afea547f8ee91c72;hb=ef3620529c936a8790d6970c57198b4caee09c0d;hp=41f5a78bf15546a8b8d49853b0f79b7841f4a4cc;hpb=6ef23e1d7f7f47ccab5be6ff1b68e5cfdda80ad2;p=ric-plt%2Fxapp-frame-cpp.git

diff --git a/src/messaging/message.cpp b/src/messaging/message.cpp
index 41f5a78..a8b8089 100644
--- a/src/messaging/message.cpp
+++ b/src/messaging/message.cpp
@@ -152,14 +152,14 @@ xapp::Message::~Message() {
 */
 //char* Message::Copy_payload( ){
 std::unique_ptr<unsigned char> xapp::Message::Copy_payload( ){
-	unsigned char*	new_payload = NULL;
 
 	if( mbuf != NULL ) {
-		new_payload = (unsigned char *) malloc( sizeof( unsigned char ) * mbuf->len );
+		unsigned char*	new_payload = new unsigned char[mbuf->len];
 		memcpy( new_payload, mbuf->payload, mbuf->len );
+		return std::unique_ptr<unsigned char>( new_payload );
 	}
 
-	return std::unique_ptr<unsigned char>( new_payload );
+	return NULL;
 }
 
 /*
@@ -198,10 +198,7 @@ int	xapp::Message::Get_mtype(){
 	Makes a copy of the source field and returns a smart pointer to it.
 */
 std::unique_ptr<unsigned char> xapp::Message::Get_src(){
-	unsigned char* m = NULL;
-
-	m = (unsigned char *) malloc( sizeof( unsigned char ) * RMR_MAX_SRC );
-	memset( m, 0, sizeof( unsigned char ) * RMR_MAX_SRC );
+	unsigned char* m = new unsigned char[RMR_MAX_SRC]; 
 
 	if( m != NULL ) {
 		rmr_get_src( mbuf, m );