X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Frmr%2Fsi%2Fsrc%2Frmr_si.c;h=047401d5f6862139d636e2d0a4de5277b609f3d0;hb=4d1f9bf4b14788f957964d93af940e84f8f01601;hp=fa46ad7a16dbc2fd0ed47260279ac801f1326753;hpb=20829ec38b851e7894883ba6b1711ccf8d05c3f4;p=ric-plt%2Flib%2Frmr.git

diff --git a/src/rmr/si/src/rmr_si.c b/src/rmr/si/src/rmr_si.c
index fa46ad7..047401d 100644
--- a/src/rmr/si/src/rmr_si.c
+++ b/src/rmr/si/src/rmr_si.c
@@ -875,7 +875,9 @@ extern rmr_mbuf_t* rmr_mt_rcv( void* vctx, rmr_mbuf_t* mbuf, int max_wait ) {
 			}
 		}
 
-		mbuf->flags |= MFL_ADDSRC;               // turn on so if user app tries to send this buffer we reset src
+		if( mbuf != NULL ) {
+			mbuf->flags |= MFL_ADDSRC;               // turn on so if user app tries to send this buffer we reset src
+		}
 		return mbuf;
 	}
 
@@ -1056,7 +1058,9 @@ extern rmr_mbuf_t* rmr_mt_call( void* vctx, rmr_mbuf_t* mbuf, int call_id, int m
 	}
 
 	mbuf = chute->mbuf;
-	mbuf->state = RMR_OK;
+	if( mbuf != NULL ) {
+		mbuf->state = RMR_OK;
+	}
 	chute->mbuf = NULL;
 
 	return mbuf;