X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Frmr%2Fsi%2Fsrc%2Fsr_si_static.c;h=28fb69c9f04403537359529d4e9c867dd68ab955;hb=6af063ee12dc292b7d37459199e2a51285030217;hp=798fe261c6d2a54a50e1ba6fddb782f5506ce77c;hpb=e15b1382dc618f6832957e67dc638b5e8f3f414d;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/si/src/sr_si_static.c b/src/rmr/si/src/sr_si_static.c
index 798fe26..28fb69c 100644
--- a/src/rmr/si/src/sr_si_static.c
+++ b/src/rmr/si/src/sr_si_static.c
@@ -126,6 +126,7 @@ static inline void insert_mlen( uint32_t len, char* buf ) {
 	blen++;
 	*blen = htonl( len );					// new systems want a converted integer
 
+	memset( &buf[TP_SZFIELD_LEN], 0, 4 );	// clear to prevent future conversion issues
 	buf[TP_SZFIELD_LEN-1] = TP_SZ_MARKER;	// marker to flag this is generated by a new message
 }
 
@@ -351,7 +352,8 @@ static inline rmr_mbuf_t* clone_msg( rmr_mbuf_t* old_msg  ) {
 	v1hdr = (uta_v1mhdr_t *) old_msg->header;				// v1 will work to dig header out of any version
 	switch( ntohl( v1hdr->rmr_ver ) ) {
 		case 1:
-			memcpy( v1hdr, old_msg->header, sizeof( *v1hdr ) );	 	// copy complete header
+			hdr = nm->header;
+			memcpy( hdr, old_msg->header, sizeof( *v1hdr ) );	 	// copy complete header
 			nm->payload = (void *) v1hdr + sizeof( *v1hdr );
 			break;
 
@@ -552,11 +554,11 @@ static inline rmr_mbuf_t* realloc_payload( rmr_mbuf_t* old_msg, int payload_len,
 	SET_HDR_LEN( nm->header );
 
 	if( copy ) {																// if we need to copy the old payload too
-		if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "rmr_realloc_payload: copy payload into new message: %d bytes\n", old_psize );
 		memcpy( nm->header, omhdr, sizeof( char ) * (old_psize + RMR_HDR_LEN( omhdr )) );
+		if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "rmr_realloc_payload: copy payload into new message: %d bytes\n", old_psize );
 	} else {																	// just need to copy header
-		if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "rmr_realloc_payload: copy only header into new message: %d bytes\n", RMR_HDR_LEN( nm->header ) );
 		memcpy( nm->header, omhdr, sizeof( char ) * RMR_HDR_LEN( omhdr ) );
+		if( DEBUG ) rmr_vlog( RMR_VL_DEBUG, "rmr_realloc_payload: copy only header into new message: %d bytes\n", RMR_HDR_LEN( nm->header ) );
 	}
 
 	ref_tpbuf( nm, mlen );			// set payload and other pointers in the message to the new tp buffer