[DELIA-68036] RRD failing in device for some commands, getting invalid message type (SCXI11BEI)

src/rrdEventProcess.c

@@ -97,15 +97,28 @@ void processIssueTypeEvent(data_buf *rbuf)
                     {
                         RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);
                     }
-                    free(cmdBuff);
+		    if(cmdBuff)
+		    {
+                        free(cmdBuff);
+			cmdBuff = NULL;
+		    }
                 }
                 else
                 {
                     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);
                 }
-                free(cmdMap[index]);
+		if( cmdMap[index])
+		{
+                    free(cmdMap[index]);
+		    cmdMap[index] = NULL;
+		}
+
             }
-            free(cmdMap);
+	    if( cmdMap)
+	    {
+                free(cmdMap);
+		cmdMap = NULL;
+	    }
         }
     }
 

src/rrdInterface.c

@@ -319,13 +319,12 @@ void _remoteDebuggerEventHandler(rbusHandle_t handle, rbusEvent_t const* event,
     }
 
     int len = strlen(rbusValue_GetString(value, NULL));
-    dataMsg = (char *) calloc(1, len);
+    dataMsg = (char*) rbusValue_GetString(value, NULL);
     if(!dataMsg)
     {
-        RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory Allocation Failed for %s \n", __FUNCTION__, __LINE__, rbusValue_ToString(value, NULL, 0));
+        RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Returning dataMsg being NULL \n", __FUNCTION__, __LINE__);
         return;
     }
-    strncpy(dataMsg, rbusValue_GetString(value, NULL), len);
     if (dataMsg[0] == '\0' || len <= 0  )
     {
         RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Message Received is empty, Exit Processing!!! \n", __FUNCTION__, __LINE__);