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

mtirum011 · mtirum011 · commit d8c0cd155e1c · 2026-02-06T07:37:01.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;
+            }
         }
     }
     
@@ -155,6 +155,7 @@ static void processIssueType(data_buf *rbuf)
                 if (dynamicprofiledata == NULL)
                 {
                     RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Dynamic Profie Info not found, Download RDM package... \n", __FUNCTION__, __LINE__);
+                    free(pIssueNode); // free issue node struct when dynamic profile not found
                 }
                 else
                 {
@@ -164,6 +165,17 @@ 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);
+                        free(pIssueNode); // free issue node struct
                     }
                     else
                     {
@@ -173,35 +185,54 @@ 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(pIssueNode); // free issue node struct on realloc failure
+                        }
+                        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);
+                            // pIssueNode is NOT freed here - checkIssueNodeInfo frees Node and subNode members only
+                            free(pIssueNode); // free issue node struct after command execution
                         }
-                        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
+                        if (dynamicprofiledata->rfcvalue != NULL)
+                        {
+                            free(dynamicprofiledata->rfcvalue);
+                        }
+                        if (dynamicprofiledata->command != NULL)
+                        {
+                            free(dynamicprofiledata->command);
+                        }
+                        free(dynamicprofiledata);
                     }
                 }
 	    }	    
 	    else if (rbuf->inDynamic)
             {
                 RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Checking if Issue marked inDynamic... \n", __FUNCTION__, __LINE__);
                 processIssueTypeInDynamicProfile(rbuf, pIssueNode);
+                free(pIssueNode); // free issue node struct
             }
             else
             {
                 RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Issue not marked as inDynamic... \n", __FUNCTION__, __LINE__);
 		RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Checking Issue from Static... \n", __FUNCTION__, __LINE__);
                 processIssueTypeInStaticProfile(rbuf, pIssueNode);
+                free(pIssueNode); // free issue node struct
             }
 	    //CID-336989: Resource leak
         }
@@ -303,6 +334,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
@@ -335,9 +335,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
     {
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);
 	    }
@@ -425,6 +450,7 @@ bool invokeSanityandCommandExec(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
     {
@@ -449,6 +475,7 @@ bool invokeSanityandCommandExec(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
         { 
@@ -486,6 +513,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 +535,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 +588,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 +674,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);

Original file line number	Diff line number	Diff line change
`@@ -114,11 +114,11 @@ void processIssueTypeEvent(data_buf *rbuf)`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`}`
`117`		`- if( cmdMap)`
`118`		`- {`
	`117`	`+ if( cmdMap)`
	`118`	`+ {`
`119`	`119`	`free(cmdMap);`
`120`		`- cmdMap = NULL;`
`121`		`- }`
	`120`	`+ cmdMap = NULL;`
	`121`	`+ }`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`@@ -155,6 +155,7 @@ static void processIssueType(data_buf *rbuf)`
`155`	`155`	`if (dynamicprofiledata == NULL)`
`156`	`156`	`{`
`157`	`157`	`RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Dynamic Profie Info not found, Download RDM package... \n", __FUNCTION__, __LINE__);`
	`158`	`+ free(pIssueNode); // free issue node struct when dynamic profile not found`
`158`	`159`	`}`
`159`	`160`	`else`
`160`	`161`	`{`
`@@ -164,6 +165,17 @@ static void processIssueType(data_buf *rbuf)`
`164`	`165`	`if (staticprofiledata == NULL)`
`165`	`166`	`{`
`166`	`167`	`RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Static Command Info not found for IssueType!!! \n", __FUNCTION__, __LINE__);`
	`168`	`+ // Free dynamicprofiledata since we can't proceed`
	`169`	`+ if (dynamicprofiledata->rfcvalue != NULL)`
	`170`	`+ {`
	`171`	`+ free(dynamicprofiledata->rfcvalue);`
	`172`	`+ }`
	`173`	`+ if (dynamicprofiledata->command != NULL)`
	`174`	`+ {`
	`175`	`+ free(dynamicprofiledata->command);`
	`176`	`+ }`
	`177`	`+ free(dynamicprofiledata);`
	`178`	`+ free(pIssueNode); // free issue node struct`
`167`	`179`	`}`
`168`	`180`	`else`
`169`	`181`	`{`
`@@ -173,35 +185,54 @@ static void processIssueType(data_buf *rbuf)`
`173`	`185`	`size_t dynamicstrlen = strlen(dynamicprofiledata->command);`
`174`	`186`	`if (staticstrlen > 0 && staticprofiledata->command[staticstrlen - 1] == '"') {`
`175`	`187`	`staticprofiledata->command[staticstrlen - 1] = '\0';`
	`188`	`+ staticstrlen--; // Update length after removing trailing quote`
`176`	`189`	`}`
`177`	`190`	`if (dynamicprofiledata->command[0] == '"') {`
`178`	`191`	`dynamicprofiledata->command[0] = COMMAND_DELIM;`
`179`	`192`	`}`
`180`	`193`	`RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Static Profile Commands: %s, Dynamic Profile Commands: %s\n", __FUNCTION__, __LINE__, staticprofiledata->command, dynamicprofiledata->command);`
`181`	`194`
`182`		`- size_t appendstrlen = ((staticstrlen - 1) + dynamicstrlen + 1);`
	`195`	`+ size_t appendstrlen = (staticstrlen + dynamicstrlen + 1);`
`183`	`196`	`char appendcommandstr = (char )realloc(staticprofiledata->command, appendstrlen);`
`184`	`197`	`if (appendcommandstr == NULL) {`
`185`		`- RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);`
	`198`	`+ RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);`
	`199`	`+ free(pIssueNode); // free issue node struct on realloc failure`
	`200`	`+ }`
	`201`	`+ else`
	`202`	`+ {`
	`203`	`+ strcat(appendcommandstr, dynamicprofiledata->command);`
	`204`	`+ staticprofiledata->command = appendcommandstr;`
	`205`	`+ RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Updated command after append from dynamic and static profile: %s \n", __FUNCTION__, __LINE__, staticprofiledata->command);`
	`206`	`+ RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Executing Commands in Runtime Service... \n",__FUNCTION__,__LINE__);`
	`207`	`+ checkIssueNodeInfo(pIssueNode, NULL, rbuf, false, staticprofiledata);`
	`208`	`+ // pIssueNode is NOT freed here - checkIssueNodeInfo frees Node and subNode members only`
	`209`	`+ free(pIssueNode); // free issue node struct after command execution`
`186`	`210`	`}`
`187`		`- strcat(appendcommandstr, dynamicprofiledata->command);`
`188`		`- staticprofiledata->command = appendcommandstr;`
`189`		`- RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Updated command after append from dynamic and static profile: %s \n", __FUNCTION__, __LINE__, staticprofiledata->command);`
`190`		`- RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Executing Commands in Runtime Service... \n",__FUNCTION__,__LINE__);`
`191`		`- checkIssueNodeInfo(pIssueNode, NULL, rbuf, false, staticprofiledata);`
	`211`	`+ // Free dynamicprofiledata after use`
	`212`	`+ if (dynamicprofiledata->rfcvalue != NULL)`
	`213`	`+ {`
	`214`	`+ free(dynamicprofiledata->rfcvalue);`
	`215`	`+ }`
	`216`	`+ if (dynamicprofiledata->command != NULL)`
	`217`	`+ {`
	`218`	`+ free(dynamicprofiledata->command);`
	`219`	`+ }`
	`220`	`+ free(dynamicprofiledata);`
`192`	`221`	`}`
`193`	`222`	`}`
`194`	`223`	`}`
`195`	`224`	`else if (rbuf->inDynamic)`
`196`	`225`	`{`
`197`	`226`	`RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Checking if Issue marked inDynamic... \n", __FUNCTION__, __LINE__);`
`198`	`227`	`processIssueTypeInDynamicProfile(rbuf, pIssueNode);`
	`228`	`+ free(pIssueNode); // free issue node struct`
`199`	`229`	`}`
`200`	`230`	`else`
`201`	`231`	`{`
`202`	`232`	`RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Issue not marked as inDynamic... \n", __FUNCTION__, __LINE__);`
`203`	`233`	`RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Checking Issue from Static... \n", __FUNCTION__, __LINE__);`
`204`	`234`	`processIssueTypeInStaticProfile(rbuf, pIssueNode);`
	`235`	`+ free(pIssueNode); // free issue node struct`
`205`	`236`	`}`
`206`	`237`	`//CID-336989: Resource leak`
`207`	`238`	`}`
`@@ -303,6 +334,8 @@ static void processIssueTypeInStaticProfile(data_buf rbuf, issueNodeData pIssu`
`303`	`334`	`{ // Static Profile JSON Parsing or Read Fail`
`304`	`335`	`RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Static Profile Parse/Read failed... %s\n", __FUNCTION__, __LINE__, RRD_JSON_FILE);`
`305`	`336`	`processIssueTypeInInstalledPackage(rbuf, pIssueNode);`
	`337`	`+ RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Exiting...\n", __FUNCTION__, __LINE__);`
	`338`	`+ return;`
`306`	`339`	`}`
`307`	`340`	`RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Static Profile Parse And Read Success... %s\n", __FUNCTION__, __LINE__, RRD_JSON_FILE);`
`308`	`341`	`RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Check if Issue in Parsed Static JSON... %s\n", __FUNCTION__, __LINE__, RRD_JSON_FILE);`
Original file line number	Diff line number	Diff line change
`@@ -335,9 +335,11 @@ void _remoteDebuggerEventHandler(rbusHandle_t handle, rbusEvent_t const* event,`
`335`	`335`	`}`
`336`	`336`	`strncpy(dataMsg, rbusValue_GetString(value, NULL), len-1);`
`337`	`337`	`dataMsg[len-1]='\0';`
	`338`	`+`
`338`	`339`	`if (dataMsg[0] == '\0' \|\| len <= 0 )`
`339`	`340`	`{`
`340`	`341`	`RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Message Received is empty, Exit Processing!!! \n", __FUNCTION__, __LINE__);`
	`342`	`+ free(dataMsg);`
`341`	`343`	`}`
`342`	`344`	`else`
`343`	`345`	`{`
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`	`}`
`@@ -425,6 +450,7 @@ bool invokeSanityandCommandExec(issueNodeData issuestructNode, cJSON jsoncfg,`
`425`	`450`	`{`
`426`	`451`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: No Commands found, exiting.. \n",__FUNCTION__,__LINE__);`
`427`	`452`	`free(issuestdata);`
	`453`	`+ return NULL;`
`428`	`454`	`}`
`429`	`455`	`else`
`430`	`456`	`{`
`@@ -449,6 +475,7 @@ bool invokeSanityandCommandExec(issueNodeData issuestructNode, cJSON jsoncfg,`
`449`	`475`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Aborting Command execution due to Harmful commands!!!\n",__FUNCTION__,__LINE__);`
`450`	`476`	`free(issuestdata->command);`
`451`	`477`	`free(issuestdata);`
	`478`	`+ return NULL;`
`452`	`479`	`}`
`453`	`480`	`else`
`454`	`481`	`{`
`@@ -486,6 +513,14 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`486`	`513`	`struct tm *ltime;`
`487`	`514`	`rfcbuf = strdup(buff->mdata);`
`488`	`515`
	`516`	`+ if (rfcbuf == NULL)`
	`517`	`+ {`
	`518`	`+ RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for rfcbuf\n",__FUNCTION__,__LINE__);`
	`519`	`+ free(buff->mdata); // free rfc data`
	`520`	`+ free(buff->jsonPath); // free rrd path info`
	`521`	`+ return;`
	`522`	`+ }`
	`523`	`+`
`489`	`524`	`// Creating Directory for MainNode under /tmp/rrd Folder`
`490`	`525`	`ctime = time (NULL);`
`491`	`526`	`ltime = localtime (&ctime);`
`@@ -500,6 +535,7 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`500`	`535`	`if (mkdir(outdir,0777) != 0)`
`501`	`536`	`{`
`502`	`537`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: %s Directory creation failed!!!\n",__FUNCTION__,__LINE__,outdir);`
	`538`	`+ free(rfcbuf); // free duplicated rfc data`
`503`	`539`	`free(buff->mdata); // free rfc data`
`504`	`540`	`free(buff->jsonPath); // free rrd path info`
`505`	`541`	`return;`
`@@ -552,12 +588,16 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`552`	`588`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: RRD Upload Script Execution Success...\n",__FUNCTION__,__LINE__);`
`553`	`589`	`}`
`554`	`590`	`}`
	`591`	`+ free(rfcbuf); // free duplicated rfc data`
`555`	`592`	`free(buff->mdata); // free rfc data`
`556`	`593`	`free(buff->jsonPath); // free rrd path info`
`557`	`594`	`}`
`558`	`595`	`else`
`559`	`596`	`{`
`560`	`597`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: No Command excuted as RRD Failed to change directory:%s\n",__FUNCTION__,__LINE__,outdir);`
	`598`	`+ free(rfcbuf); // free duplicated rfc data`
	`599`	`+ free(buff->mdata); // free rfc data`
	`600`	`+ free(buff->jsonPath); // free rrd path info`
`561`	`601`	`}`
`562`	`602`	`}`
`563`	`603`	`}`
`@@ -634,7 +674,7 @@ bool processAllDebugCommand(cJSON jsoncfg, issueNodeData issuestructNode, char`
`634`	`674`	`}`
`635`	`675`	`}`
`636`	`676`	`}`
`637`		`- free(rfcbuf); // free rfc value`
	`677`	`+ // Note: rfcbuf is owned by caller and will be freed there`
`638`	`678`	`}`
`639`	`679`	`else`
`640`	`680`	`{`
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);`