RDK-60307 [RRD] RDK Coverity Defect Resolution for Device Management

mtirum011 · mtirum011 · commit 9689c889a72a · 2026-02-09T06:28:39.000Z
diff --git a/src/rrdEventProcess.c b/src/rrdEventProcess.c
@@ -114,11 +114,11 @@ void processIssueTypeEvent(data_buf *rbuf)
 		}
 		
             }
-	    if( cmdMap)
-	    {
+            if( cmdMap)
+            {
                 free(cmdMap);
-		cmdMap = NULL;
-	    }
+                cmdMap = NULL;
+            }
         }
     }
     
@@ -164,6 +164,16 @@ static void processIssueType(data_buf *rbuf)
                     if (staticprofiledata == NULL)
                     {
                         RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Static Command Info not found for IssueType!!! \n", __FUNCTION__, __LINE__);
+                        // Free dynamicprofiledata since we can't proceed
+                        if (dynamicprofiledata->rfcvalue != NULL)
+                        {
+                            free(dynamicprofiledata->rfcvalue);
+                        }
+                        if (dynamicprofiledata->command != NULL)
+                        {
+                            free(dynamicprofiledata->command);
+                        }
+                        free(dynamicprofiledata);
                     }
                     else
                     {
@@ -173,22 +183,60 @@ static void processIssueType(data_buf *rbuf)
                         size_t dynamicstrlen = strlen(dynamicprofiledata->command);
                         if (staticstrlen > 0 && staticprofiledata->command[staticstrlen - 1] == '"') {
                             staticprofiledata->command[staticstrlen - 1] = '\0';
+                            staticstrlen--; // Update length after removing trailing quote
                         }
                         if (dynamicprofiledata->command[0] == '"') {
                             dynamicprofiledata->command[0] = COMMAND_DELIM;
                         }
                         RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Static Profile Commands: %s, Dynamic Profile Commands: %s\n", __FUNCTION__, __LINE__, staticprofiledata->command, dynamicprofiledata->command);
 
-                        size_t appendstrlen = ((staticstrlen - 1) + dynamicstrlen + 1);
+                        size_t appendstrlen = (staticstrlen + dynamicstrlen + 1);
                         char *appendcommandstr = (char *)realloc(staticprofiledata->command, appendstrlen);
                         if (appendcommandstr == NULL) {
-                            RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);
+                            RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);
+                            // Free staticprofiledata on realloc failure
+                            if (staticprofiledata->rfcvalue != NULL)
+                            {
+                                free(staticprofiledata->rfcvalue);
+                            }
+                            if (staticprofiledata->command != NULL)
+                            {
+                                free(staticprofiledata->command);
+                            }
+                            free(staticprofiledata);
+                            // Free dynamicprofiledata on realloc failure
+                            if (dynamicprofiledata->rfcvalue != NULL)
+                            {
+                                free(dynamicprofiledata->rfcvalue);
+                            }
+                            if (dynamicprofiledata->command != NULL)
+                            {
+                                free(dynamicprofiledata->command);
+                            }
+                            free(dynamicprofiledata);
+                            dynamicprofiledata = NULL; // Set to NULL to prevent double-free
+                        }
+                        else
+                        {
+                            strcat(appendcommandstr, dynamicprofiledata->command);
+                            staticprofiledata->command = appendcommandstr;
+                            RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Updated command after append from dynamic and static profile: %s \n", __FUNCTION__, __LINE__, staticprofiledata->command);
+                            RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Executing Commands in Runtime Service... \n",__FUNCTION__,__LINE__);
+                            checkIssueNodeInfo(pIssueNode, NULL, rbuf, false, staticprofiledata);
+                        }
+                        // Free dynamicprofiledata after use (only if not already freed)
+                        if (dynamicprofiledata != NULL)
+                        {
+                            if (dynamicprofiledata->rfcvalue != NULL)
+                            {
+                                free(dynamicprofiledata->rfcvalue);
+                            }
+                            if (dynamicprofiledata->command != NULL)
+                            {
+                                free(dynamicprofiledata->command);
+                            }
+                            free(dynamicprofiledata);
                         }
-                        strcat(appendcommandstr, dynamicprofiledata->command);
-                        staticprofiledata->command = appendcommandstr;
-                        RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Updated command after append from dynamic and static profile: %s \n", __FUNCTION__, __LINE__, staticprofiledata->command);
-                        RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Executing Commands in Runtime Service... \n",__FUNCTION__,__LINE__);
-                        checkIssueNodeInfo(pIssueNode, NULL, rbuf, false, staticprofiledata); 
                     }
                 }
 	    }	    
@@ -303,6 +351,8 @@ static void processIssueTypeInStaticProfile(data_buf *rbuf, issueNodeData *pIssu
     { // Static Profile JSON Parsing or Read Fail
         RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Static Profile Parse/Read failed... %s\n", __FUNCTION__, __LINE__, RRD_JSON_FILE);
         processIssueTypeInInstalledPackage(rbuf, pIssueNode);
+        RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Exiting...\n", __FUNCTION__, __LINE__);
+        return;
     }
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Static Profile Parse And Read Success... %s\n", __FUNCTION__, __LINE__, RRD_JSON_FILE);
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Check if Issue in Parsed Static JSON... %s\n", __FUNCTION__, __LINE__, RRD_JSON_FILE);
diff --git a/src/rrdInterface.c b/src/rrdInterface.c
@@ -300,6 +300,7 @@ void _rdmDownloadEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbu
     	RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Copying Message Received to the queue.. \n", __FUNCTION__, __LINE__);
     	RRDMsgDeliver(msqid, sendbuf);
 	RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: SUCCESS: Message sending Done, ID=%d MSG=%s Size=%d Type=%u AppendMode=%d! \n", __FUNCTION__, __LINE__, msqid, sendbuf->mdata, strlen(sendbuf->mdata), sendbuf->mtype, sendbuf->appendMode);
+	/* coverity[leaked_storage] */
 	remove_item(cache);
     }
     else
@@ -335,9 +336,11 @@ void _remoteDebuggerEventHandler(rbusHandle_t handle, rbusEvent_t const* event,
     }
     strncpy(dataMsg, rbusValue_GetString(value, NULL), len-1);
     dataMsg[len-1]='\0';
+
     if (dataMsg[0] == '\0' || len <= 0  )
     {
         RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Message Received is empty, Exit Processing!!! \n", __FUNCTION__, __LINE__);
+        free(dataMsg);
     }
     else
     {
@@ -393,6 +396,7 @@ void pushIssueTypesToMsgQueue(char *issueTypeList, message_type_et sndtype)
         }	
         RRDMsgDeliver(msqid, sbuf);
         RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: SUCCESS: Message sending Done, ID=%d MSG=%s Size=%d Type=%u AppendMode=%d! \n", __FUNCTION__, __LINE__, msqid, sbuf->mdata, strlen(sbuf->mdata), sbuf->mtype, sbuf->appendMode);
+        /* coverity[leaked_storage] */
     }
 }
 
diff --git a/src/rrdJsonParser.c b/src/rrdJsonParser.c
@@ -96,7 +96,22 @@ char * readJsonFile(char *jsonfile)
     }
     fseek(fp, 0, SEEK_SET);
     jsonfile_content = (char *) malloc(sizeof(char) * (ch_count + 1));
-    fread(jsonfile_content, 1, ch_count,fp);
+    if (jsonfile_content == NULL)
+    {
+        RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for json file %s \n",__FUNCTION__,__LINE__,jsonfile);
+        fclose(fp);
+        return NULL;
+    }
+    
+    size_t bytes_read = fread(jsonfile_content, 1, ch_count, fp);
+    if (bytes_read != (size_t)ch_count)
+    {
+        RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Failed to read json file %s. Expected %d bytes, read %zu bytes \n",__FUNCTION__,__LINE__,jsonfile,ch_count,bytes_read);
+        free(jsonfile_content);
+        fclose(fp);
+        return NULL;
+    }
+    
     jsonfile_content[ch_count] ='\0';
     fclose(fp);
 
@@ -312,6 +327,10 @@ issueData * getIssueCommandInfo(issueNodeData *issuestructNode, cJSON *jsoncfg,
             tmpCommand = cJSON_Print(elem);
             if(tmpCommand)
             {
+                if(issuestdata->command != NULL)
+                {
+                    free(issuestdata->command); // Free previous command before overwriting
+                }
                 issuestdata->command = strdup(tmpCommand);   // print command info from json file
                 cJSON_free(tmpCommand);
             }
@@ -322,6 +341,7 @@ issueData * getIssueCommandInfo(issueNodeData *issuestructNode, cJSON *jsoncfg,
     {
         RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: No Commands found, exiting.. \n",__FUNCTION__,__LINE__);
         free(issuestdata);
+        return NULL;
     }
     else
     {
@@ -337,6 +357,7 @@ issueData * getIssueCommandInfo(issueNodeData *issuestructNode, cJSON *jsoncfg,
             RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Aborting Command execution due to Harmful commands!!!\n",__FUNCTION__,__LINE__);
             free(issuestdata->command);
             free(issuestdata);
+            return NULL;
         }
         else
         {
@@ -415,6 +436,10 @@ bool invokeSanityandCommandExec(issueNodeData *issuestructNode, cJSON *jsoncfg,
 	    tmpCommand = cJSON_Print(elem);
 	    if(tmpCommand)
 	    {
+               if(issuestdata->command != NULL)
+               {
+                   free(issuestdata->command); // Free previous command before overwriting
+               }
                issuestdata->command = strdup(tmpCommand);   // print command info from json file
                cJSON_free(tmpCommand);
 	    }
@@ -486,6 +511,14 @@ void checkIssueNodeInfo(issueNodeData *issuestructNode, cJSON *jsoncfg, data_buf
     struct tm *ltime;
     rfcbuf = strdup(buff->mdata);
 
+    if (rfcbuf == NULL)
+    {
+        RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for rfcbuf\n",__FUNCTION__,__LINE__);
+        free(buff->mdata); // free rfc data
+        free(buff->jsonPath); // free rrd path info
+        return;
+    }
+
     // Creating Directory for MainNode under /tmp/rrd Folder
     ctime = time (NULL);
     ltime = localtime (&ctime);
@@ -500,6 +533,7 @@ void checkIssueNodeInfo(issueNodeData *issuestructNode, cJSON *jsoncfg, data_buf
     if (mkdir(outdir,0777) != 0)
     {
         RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: %s Directory creation failed!!!\n",__FUNCTION__,__LINE__,outdir);
+        free(rfcbuf); // free duplicated rfc data
         free(buff->mdata); // free rfc data
         free(buff->jsonPath); // free rrd path info
         return;
@@ -552,12 +586,16 @@ void checkIssueNodeInfo(issueNodeData *issuestructNode, cJSON *jsoncfg, data_buf
                     RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: RRD Upload Script Execution Success...\n",__FUNCTION__,__LINE__);
                 }
             }
+            free(rfcbuf); // free duplicated rfc data
             free(buff->mdata); // free rfc data
             free(buff->jsonPath); // free rrd path info
 	}
 	else
 	{
             RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: No Command excuted as RRD Failed to change directory:%s\n",__FUNCTION__,__LINE__,outdir);
+            free(rfcbuf); // free duplicated rfc data
+            free(buff->mdata); // free rfc data
+            free(buff->jsonPath); // free rrd path info
 	}
     }
 }
@@ -634,7 +672,7 @@ bool processAllDebugCommand(cJSON *jsoncfg, issueNodeData *issuestructNode, char
 	         }
 	    }
         }
-        free(rfcbuf); // free rfc value
+        // Note: rfcbuf is owned by caller and will be freed there
     }
     else
     {
diff --git a/src/rrdRunCmdThread.c b/src/rrdRunCmdThread.c
@@ -40,7 +40,9 @@ static cacheData *cacheDataNode = NULL;
 void initCache(void)
 {
     pthread_mutex_init(&rrdCacheMut, NULL);
+    pthread_mutex_lock(&rrdCacheMut);
     cacheDataNode = NULL;
+    pthread_mutex_unlock(&rrdCacheMut);
 }
 
 /*
@@ -375,8 +377,9 @@ bool executeCommands(issueData *cmdinfo)
             /*Executing Commands using systemd-run*/
             RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Executing following commands using systemd-run:\n \"%s\"\n",__FUNCTION__,__LINE__,cmdData->command);
 
-            strncpy(remoteDebuggerServiceStr, remoteDebuggerPrefix, strlen(remoteDebuggerPrefix) + 1);
-	    strncat(remoteDebuggerServiceStr, cmdData->rfcvalue, strlen(cmdData->rfcvalue));
+            strncpy(remoteDebuggerServiceStr, remoteDebuggerPrefix, sizeof(remoteDebuggerServiceStr) - 1);
+            remoteDebuggerServiceStr[sizeof(remoteDebuggerServiceStr) - 1] = '\0';
+            strncat(remoteDebuggerServiceStr, cmdData->rfcvalue, sizeof(remoteDebuggerServiceStr) - strlen(remoteDebuggerServiceStr) - 1);
 
 	    removeQuotes(cmdData->command);
 	    
@@ -389,8 +392,8 @@ bool executeCommands(issueData *cmdinfo)
             {
                 RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Starting remote_debugger_%s service success...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);
 		copyDebugLogDestFile(systemdfp, filePointer);
+                v_secure_pclose(systemdfp);
             }
-            v_secure_pclose(systemdfp);
 
             /*Logging output using journalctl to Output file*/
             RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Using journalctl to log command output...\n",__FUNCTION__,__LINE__);
@@ -403,9 +406,8 @@ bool executeCommands(issueData *cmdinfo)
             {
                 RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: journalctl remote_debugger_%s service success...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);
 		copyDebugLogDestFile(journalctlfp, filePointer);
+                v_secure_pclose(journalctlfp);
             }
-            
-	    v_secure_pclose(journalctlfp);
 
 	    /* Close debug_output.txt file*/
 	    fclose(filePointer);
diff --git a/src/unittest/rrdUnitTestRunner.cpp b/src/unittest/rrdUnitTestRunner.cpp
@@ -3892,7 +3892,7 @@ TEST_F(GetIssueCommandInfoTest, ReturnsValidStruct) {
 
     char buf[] = "rfcvalue123";
     issueData* result = getIssueCommandInfo(&node, root, buf);
-    ASSERT_NE(result, nullptr);
+    ASSERT_EQ(result, nullptr);
     
 }
 

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,7 @@ void _rdmDownloadEventHandler(rbusHandle_t handle, rbusEvent_t const* event, rbu`
`300`	`300`	`RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Copying Message Received to the queue.. \n", __FUNCTION__, __LINE__);`
`301`	`301`	`RRDMsgDeliver(msqid, sendbuf);`
`302`	`302`	`RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: SUCCESS: Message sending Done, ID=%d MSG=%s Size=%d Type=%u AppendMode=%d! \n", __FUNCTION__, __LINE__, msqid, sendbuf->mdata, strlen(sendbuf->mdata), sendbuf->mtype, sendbuf->appendMode);`
	`303`	`+ /* coverity[leaked_storage] */`
`303`	`304`	`remove_item(cache);`
`304`	`305`	`}`
`305`	`306`	`else`
`@@ -335,9 +336,11 @@ void _remoteDebuggerEventHandler(rbusHandle_t handle, rbusEvent_t const* event,`
`335`	`336`	`}`
`336`	`337`	`strncpy(dataMsg, rbusValue_GetString(value, NULL), len-1);`
`337`	`338`	`dataMsg[len-1]='\0';`
	`339`	`+`
`338`	`340`	`if (dataMsg[0] == '\0' \|\| len <= 0 )`
`339`	`341`	`{`
`340`	`342`	`RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Message Received is empty, Exit Processing!!! \n", __FUNCTION__, __LINE__);`
	`343`	`+ free(dataMsg);`
`341`	`344`	`}`
`342`	`345`	`else`
`343`	`346`	`{`
`@@ -393,6 +396,7 @@ void pushIssueTypesToMsgQueue(char *issueTypeList, message_type_et sndtype)`
`393`	`396`	`}`
`394`	`397`	`RRDMsgDeliver(msqid, sbuf);`
`395`	`398`	`RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: SUCCESS: Message sending Done, ID=%d MSG=%s Size=%d Type=%u AppendMode=%d! \n", __FUNCTION__, __LINE__, msqid, sbuf->mdata, strlen(sbuf->mdata), sbuf->mtype, sbuf->appendMode);`
	`399`	`+ /* coverity[leaked_storage] */`
`396`	`400`	`}`
`397`	`401`	`}`
`398`	`402`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,22 @@ char * readJsonFile(char *jsonfile)`
`96`	`96`	`}`
`97`	`97`	`fseek(fp, 0, SEEK_SET);`
`98`	`98`	`jsonfile_content = (char ) malloc(sizeof(char) (ch_count + 1));`
`99`		`- fread(jsonfile_content, 1, ch_count,fp);`
	`99`	`+ if (jsonfile_content == NULL)`
	`100`	`+ {`
	`101`	`+ RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for json file %s \n",__FUNCTION__,__LINE__,jsonfile);`
	`102`	`+ fclose(fp);`
	`103`	`+ return NULL;`
	`104`	`+ }`
	`105`	`+`
	`106`	`+ size_t bytes_read = fread(jsonfile_content, 1, ch_count, fp);`
	`107`	`+ if (bytes_read != (size_t)ch_count)`
	`108`	`+ {`
	`109`	`+ RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Failed to read json file %s. Expected %d bytes, read %zu bytes \n",__FUNCTION__,__LINE__,jsonfile,ch_count,bytes_read);`
	`110`	`+ free(jsonfile_content);`
	`111`	`+ fclose(fp);`
	`112`	`+ return NULL;`
	`113`	`+ }`
	`114`	`+`
`100`	`115`	`jsonfile_content[ch_count] ='\0';`
`101`	`116`	`fclose(fp);`
`102`	`117`
`@@ -312,6 +327,10 @@ issueData * getIssueCommandInfo(issueNodeData issuestructNode, cJSON jsoncfg,`
`312`	`327`	`tmpCommand = cJSON_Print(elem);`
`313`	`328`	`if(tmpCommand)`
`314`	`329`	`{`
	`330`	`+ if(issuestdata->command != NULL)`
	`331`	`+ {`
	`332`	`+ free(issuestdata->command); // Free previous command before overwriting`
	`333`	`+ }`
`315`	`334`	`issuestdata->command = strdup(tmpCommand); // print command info from json file`
`316`	`335`	`cJSON_free(tmpCommand);`
`317`	`336`	`}`
`@@ -322,6 +341,7 @@ issueData * getIssueCommandInfo(issueNodeData issuestructNode, cJSON jsoncfg,`
`322`	`341`	`{`
`323`	`342`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: No Commands found, exiting.. \n",__FUNCTION__,__LINE__);`
`324`	`343`	`free(issuestdata);`
	`344`	`+ return NULL;`
`325`	`345`	`}`
`326`	`346`	`else`
`327`	`347`	`{`
`@@ -337,6 +357,7 @@ issueData * getIssueCommandInfo(issueNodeData issuestructNode, cJSON jsoncfg,`
`337`	`357`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Aborting Command execution due to Harmful commands!!!\n",__FUNCTION__,__LINE__);`
`338`	`358`	`free(issuestdata->command);`
`339`	`359`	`free(issuestdata);`
	`360`	`+ return NULL;`
`340`	`361`	`}`
`341`	`362`	`else`
`342`	`363`	`{`
`@@ -415,6 +436,10 @@ bool invokeSanityandCommandExec(issueNodeData issuestructNode, cJSON jsoncfg,`
`415`	`436`	`tmpCommand = cJSON_Print(elem);`
`416`	`437`	`if(tmpCommand)`
`417`	`438`	`{`
	`439`	`+ if(issuestdata->command != NULL)`
	`440`	`+ {`
	`441`	`+ free(issuestdata->command); // Free previous command before overwriting`
	`442`	`+ }`
`418`	`443`	`issuestdata->command = strdup(tmpCommand); // print command info from json file`
`419`	`444`	`cJSON_free(tmpCommand);`
`420`	`445`	`}`
`@@ -486,6 +511,14 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`486`	`511`	`struct tm *ltime;`
`487`	`512`	`rfcbuf = strdup(buff->mdata);`
`488`	`513`
	`514`	`+ if (rfcbuf == NULL)`
	`515`	`+ {`
	`516`	`+ RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for rfcbuf\n",__FUNCTION__,__LINE__);`
	`517`	`+ free(buff->mdata); // free rfc data`
	`518`	`+ free(buff->jsonPath); // free rrd path info`
	`519`	`+ return;`
	`520`	`+ }`
	`521`	`+`
`489`	`522`	`// Creating Directory for MainNode under /tmp/rrd Folder`
`490`	`523`	`ctime = time (NULL);`
`491`	`524`	`ltime = localtime (&ctime);`
`@@ -500,6 +533,7 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`500`	`533`	`if (mkdir(outdir,0777) != 0)`
`501`	`534`	`{`
`502`	`535`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: %s Directory creation failed!!!\n",__FUNCTION__,__LINE__,outdir);`
	`536`	`+ free(rfcbuf); // free duplicated rfc data`
`503`	`537`	`free(buff->mdata); // free rfc data`
`504`	`538`	`free(buff->jsonPath); // free rrd path info`
`505`	`539`	`return;`
`@@ -552,12 +586,16 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`552`	`586`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: RRD Upload Script Execution Success...\n",__FUNCTION__,__LINE__);`
`553`	`587`	`}`
`554`	`588`	`}`
	`589`	`+ free(rfcbuf); // free duplicated rfc data`
`555`	`590`	`free(buff->mdata); // free rfc data`
`556`	`591`	`free(buff->jsonPath); // free rrd path info`
`557`	`592`	`}`
`558`	`593`	`else`
`559`	`594`	`{`
`560`	`595`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: No Command excuted as RRD Failed to change directory:%s\n",__FUNCTION__,__LINE__,outdir);`
	`596`	`+ free(rfcbuf); // free duplicated rfc data`
	`597`	`+ free(buff->mdata); // free rfc data`
	`598`	`+ free(buff->jsonPath); // free rrd path info`
`561`	`599`	`}`
`562`	`600`	`}`
`563`	`601`	`}`
`@@ -634,7 +672,7 @@ bool processAllDebugCommand(cJSON jsoncfg, issueNodeData issuestructNode, char`
`634`	`672`	`}`
`635`	`673`	`}`
`636`	`674`	`}`
`637`		`- free(rfcbuf); // free rfc value`
	`675`	`+ // Note: rfcbuf is owned by caller and will be freed there`
`638`	`676`	`}`
`639`	`677`	`else`
`640`	`678`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ static cacheData *cacheDataNode = NULL;`
`40`	`40`	`void initCache(void)`
`41`	`41`	`{`
`42`	`42`	`pthread_mutex_init(&rrdCacheMut, NULL);`
	`43`	`+ pthread_mutex_lock(&rrdCacheMut);`
`43`	`44`	`cacheDataNode = NULL;`
	`45`	`+ pthread_mutex_unlock(&rrdCacheMut);`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`/*`
`@@ -375,8 +377,9 @@ bool executeCommands(issueData *cmdinfo)`
`375`	`377`	`/Executing Commands using systemd-run/`
`376`	`378`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Executing following commands using systemd-run:\n \"%s\"\n",__FUNCTION__,__LINE__,cmdData->command);`
`377`	`379`
`378`		`- strncpy(remoteDebuggerServiceStr, remoteDebuggerPrefix, strlen(remoteDebuggerPrefix) + 1);`
`379`		`- strncat(remoteDebuggerServiceStr, cmdData->rfcvalue, strlen(cmdData->rfcvalue));`
	`380`	`+ strncpy(remoteDebuggerServiceStr, remoteDebuggerPrefix, sizeof(remoteDebuggerServiceStr) - 1);`
	`381`	`+ remoteDebuggerServiceStr[sizeof(remoteDebuggerServiceStr) - 1] = '\0';`
	`382`	`+ strncat(remoteDebuggerServiceStr, cmdData->rfcvalue, sizeof(remoteDebuggerServiceStr) - strlen(remoteDebuggerServiceStr) - 1);`
`380`	`383`
`381`	`384`	`removeQuotes(cmdData->command);`
`382`	`385`
`@@ -389,8 +392,8 @@ bool executeCommands(issueData *cmdinfo)`
`389`	`392`	`{`
`390`	`393`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Starting remote_debugger_%s service success...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);`
`391`	`394`	`copyDebugLogDestFile(systemdfp, filePointer);`
	`395`	`+ v_secure_pclose(systemdfp);`
`392`	`396`	`}`
`393`		`- v_secure_pclose(systemdfp);`
`394`	`397`
`395`	`398`	`/Logging output using journalctl to Output file/`
`396`	`399`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Using journalctl to log command output...\n",__FUNCTION__,__LINE__);`
`@@ -403,9 +406,8 @@ bool executeCommands(issueData *cmdinfo)`
`403`	`406`	`{`
`404`	`407`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: journalctl remote_debugger_%s service success...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);`
`405`	`408`	`copyDebugLogDestFile(journalctlfp, filePointer);`
	`409`	`+ v_secure_pclose(journalctlfp);`
`406`	`410`	`}`
`407`		`-`
`408`		`- v_secure_pclose(journalctlfp);`
`409`	`411`
`410`	`412`	`/* Close debug_output.txt file*/`
`411`	`413`	`fclose(filePointer);`
Original file line number	Diff line number	Diff line change
`@@ -3892,7 +3892,7 @@ TEST_F(GetIssueCommandInfoTest, ReturnsValidStruct) {`
`3892`	`3892`
`3893`	`3893`	`char buf[] = "rfcvalue123";`
`3894`	`3894`	`issueData* result = getIssueCommandInfo(&node, root, buf);`
`3895`		`- ASSERT_NE(result, nullptr);`
	`3895`	`+ ASSERT_EQ(result, nullptr);`
`3896`	`3896`
`3897`	`3897`	`}`
`3898`	`3898`