X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fmbuf_api_static_test.c;h=656287d6a3af99aecae5d251491aadbfb1c45852;hb=7193eae2f7df3046a2b50cc65f2161d9b2c5266c;hp=1ee2858170018a3a402bebbd1867ac76f094a3fc;hpb=4ac73e3b9c0ff7aef80ad45f1bfead52bb2ffc99;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/mbuf_api_static_test.c b/test/mbuf_api_static_test.c
index 1ee2858..656287d 100644
--- a/test/mbuf_api_static_test.c
+++ b/test/mbuf_api_static_test.c
@@ -40,6 +40,7 @@
 #include "rmr.h"
 #include "rmr_agnostic.h"
 
+// ---------------------------------------------------------------------------------------------
 
 int mbuf_api_test( ) {
 	unsigned char* c;
@@ -49,6 +50,8 @@ int mbuf_api_test( ) {
 	char*	buf;
 	void*	ptr;
 	rmr_mbuf_t*	mbuf;
+	rmr_mbuf_t*	mbuf2;
+	rmr_mbuf_t*	mbuf3;
 	uta_mhdr_t*	hdr;
 	unsigned char src_buf[256];
 	unsigned char dest_buf[256];
@@ -68,7 +71,7 @@ int mbuf_api_test( ) {
 	mbuf->header = mbuf->tp_buf;
 	mbuf->alloc_len = 1024;
 	mbuf->payload = PAYLOAD_ADDR( mbuf->header );
-	hdr = (rmr_mbuf_t *) mbuf->header;
+	hdr = (uta_mhdr_t *) mbuf->header;
 	mbuf->xaction = hdr->xid;
 
 
@@ -152,10 +155,18 @@ int mbuf_api_test( ) {
 	c = rmr_get_meid( mbuf, NULL );			// should allocate and return c
 	errors += fail_if( c == NULL, "get meid with nil dest pointer (did not allocate a buffer)" );
 	errors += fail_if( strcmp( c, "test-meid" ) != 0, "did not get expected meid from mbuffer" );
+	if( c ) {
+		free( c );
+		c = NULL;
+	}
 
 	c = rmr_get_meid( mbuf, c );
 	errors += fail_if( c == NULL, "get meid with a dest pointer returned no pointer" );
 	errors += fail_if( strcmp( c, "test-meid" ) != 0, "did not get expected meid from mbuffer" );
+	if( c ) {
+		free( c );
+		c = NULL;
+	}
 
 
 	// --- test transaction field  access functions ---------------------------------------------------
@@ -195,6 +206,7 @@ int mbuf_api_test( ) {
 		i = strcmp( ptr, src_buf );
 		errors += fail_not_equal( i, 0, "get xaction did not fetch expected string cmp return (a) was not 0" );
 		free( ptr );
+		ptr = NULL;
 	}
 	
 	errno = 999;
@@ -231,6 +243,7 @@ int mbuf_api_test( ) {
 	errors += fail_if( i == RMR_OK, "(rv) attempt to copy string to xact with large source buffer" );
 
 
+	rmr_free_msg( mbuf );
 
 	// ------------ trace data tests ----------------------------------------------------------------
 	// CAUTION: to support standalone mbuf api tests, the underlying buffer reallocation functions are NOT used
@@ -336,5 +349,6 @@ int mbuf_api_test( ) {
 	test_set_ver( mbuf, 2 );							// set older message version to ensure properly handled
 	buf = rmr_get_srcip( mbuf, src_buf );
 
+
 	return errors > 0;			// overall exit code bad if errors
 }