Skip to content

RDKEMW-1768 -Fix UT in RRD with Static profile update and Null Check #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open

RDKEMW-1768 -Fix UT in RRD with Static profile update and Null Check #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
20ea708
Update rrdMain.c
Abhinavpv28 Mar 8, 2025
1b2001f
Update rrdMain.c
Abhinavpv28 Mar 8, 2025
2b57858
Update rrdMain.c
Abhinavpv28 Mar 8, 2025
e0784f3
Update rrdMain.c
Abhinavpv28 Mar 8, 2025
3639cf4
Update rrdMain.c
Abhinavpv28 Mar 8, 2025
eea2c0d
Update rrdMain.c
Abhinavpv28 Mar 8, 2025
2e68880
Update rrdMain.c
Abhinavpv28 Mar 8, 2025
508fc96
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
52a44c6
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
75c33fd
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
661b118
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
cb450d3
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
3090e7b
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
7a4eae9
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
9c04ba4
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
2119bda
Update rrdCommandSanity.c
Abhinavpv28 Mar 11, 2025
24e161e
Update rrdJsonParser.c
Abhinavpv28 Mar 11, 2025
919f71c
Update rrdMain.c
Abhinavpv28 Mar 11, 2025
13f2dbb
Update rrdMain.c
Abhinavpv28 Mar 14, 2025
91e7c0a
Update rrdMain.c
Abhinavpv28 Mar 14, 2025
bb47755
Merge pull request #99 from rdkcentral/develop
Abhinavpv28 Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/rrdCommandSanity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include "rrdCommandSanity.h"
#include <ctype.h>

/*
* @function updateBackgroundCmd
Expand Down Expand Up @@ -131,9 +132,21 @@ int isCommandsValid(char *issuecmd,cJSON *sanitylist)
{
subcmd = cJSON_GetArrayItem(sanitylist, i);
checkcmd = cJSON_Print(subcmd); // Print each command from the sanity command array in Json
int len = strlen(checkcmd);
if (len >= 2 && checkcmd[0] == '"' && checkcmd[len - 1] == '"')
{
checkcmd[len - 1] = '\0'; // Remove closing quote
checkcmd++; // Move pointer forward to skip opening quote
len -= 2; // Adjust length after removing quotes
}
// Trim trailing spaces
int j = len - 1;
while (j >= 0 && isspace(checkcmd[j])) {
checkcmd[j] = '\0';
j--;
}
RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Checking for \"%s\" string in Issue commands... \n",__FUNCTION__,__LINE__,checkcmd);
sanitystr = strstr(issuecmd,checkcmd);
cJSON_free(checkcmd); // free each command from the sanity command array
if (sanitystr)
{
RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Found harmful commands: %s, Exiting!!! \n",__FUNCTION__,__LINE__,sanitystr);
Expand Down
9 changes: 9 additions & 0 deletions src/rrdJsonParser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,15 @@ bool invokeSanityandCommandExec(issueNodeData *issuestructNode, cJSON *jsoncfg,
check = cJSON_GetObjectItem(sanity, "Check");
checkval = cJSON_Print(check); // Print list of sanity commands received
RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Reading Sanity Check Commands List: \n%s\n",__FUNCTION__,__LINE__,checkval);
if(checkval ==NULL)
{
RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Entering checkval null case : \n",__FUNCTION__,__LINE__);
jsoncfg = readAndParseJSON(RRD_JSON_FILE);
sanity = cJSON_GetObjectItem(jsoncfg, "Sanity");
check = cJSON_GetObjectItem(sanity, "Check");
checkval = cJSON_Print(check); // Print list of sanity commands received
RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Reading Sanity Check Commands List: \n%s\n",__FUNCTION__,__LINE__,checkval);
}
cmdlist = cJSON_GetObjectItem(check, "Commands");
cJSON_free(checkval); // free sanity command list
ret = isCommandsValid(issuestdata->command, cmdlist);
Expand Down
Loading