Skip to content

RDKB-63939 : CLONE - [8.2p2s2] Observed CcspPandMSsp process restart … #98

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
ranganl wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKB-63939 : CLONE - [8.2p2s2] Observed CcspPandMSsp process restart … #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion source/ccsp/components/common/DataModel/dml/components/DslhObjRecord/dslh_objro_access.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,14 @@ DslhObjroGetAllParamValues
ppNameArray = (char**)AnscAllocateMemory(sizeof(char*) * uChildCount);
if( !ppNameArray ) /*RDKB-5791 , CID-33396, NULL check after mem allocation*/
{
*pulArraySize = 0;
return ANSC_STATUS_FAILURE;
}
ppValueArray = (PSLAP_VARIABLE*)AnscAllocateMemory(sizeof(PSLAP_VARIABLE) * uChildCount);
if( !ppValueArray )
{
AnscFreeMemory(ppNameArray);/*RDKB-5791 , CID-33236, NULL check after mem allocation*/
*pulArraySize = 0;
return ANSC_STATUS_FAILURE;
}

Expand Down Expand Up @@ -303,9 +305,12 @@ DslhObjroGetAllParamValues

if( ppValueArray[ulParamCount] == NULL)
{
break;
returnStatus = ANSC_STATUS_RESOURCES;
goto EXIT;
}

SlapInitVariable(ppValueArray[ulParamCount]);

ppValueArray[ulParamCount]->Name = pChildVarRecord->GetFullName((ANSC_HANDLE)pChildVarRecord);
ppValueArray[ulParamCount]->ContentType = pChildVarEntity->ContentType;
ppValueArray[ulParamCount]->Syntax = pChildVarEntity->Syntax;
Expand Down Expand Up @@ -342,6 +347,12 @@ DslhObjroGetAllParamValues
}
/* Check parameter value and change it to be 2 Ending*/

if ( (ulTotalParamCount + ulParamCount) > ulMaxParamCount )
{
returnStatus = ANSC_STATUS_BAD_PARAMETER;
goto EXIT;
}

/* copy value back */
for( i = 0; i < ulParamCount; i ++)
{
Expand Down
31 changes: 28 additions & 3 deletions source/ccsp/components/common/DataModel/dml/components/DslhWmpDatabase/dslh_wmpdo_mpaif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ DslhWmpdoMpaSetParameterValues
{
if(pVarRecord->Notification)
{
vcSig.parameterName = pParameterValueArray[i].Name;
vcSig.parameterName = AnscCloneString(pParameterValueArray[i].Name);
parseOldVal(pParameterValueArray[i].Value, &vcSig);
vcSig.newValue = vcSig.oldValue;
parseOldVal(pVarRecord->OldParamValue, &vcSig);
Expand Down Expand Up @@ -1718,6 +1718,13 @@ DslhWmpdoMpaGetParameterValues
(AnscSizeOfString(pParamNameArray->Array.arrayString[i]) == 0) ||
DslhCwmpIsPartialName(pParamNameArray->Array.arrayString[i]) )
{
if ((ulParameterIndex > ulParameterCount) && (ulParameterIndex < pParamNameArray->VarCount))
{
AnscTraceWarning(("ulParameterIndex:%lu is greater than ulParameterCount:%lu\n", ulParameterIndex, ulParameterCount));
AnscTraceWarning(("pParamNameArray->VarCount:%lu\n", pParamNameArray->VarCount));
AnscTraceWarning(("ulParamCopyCount:%lu\n", ulParamCopyCount));
}

pObjRecord = (PDSLH_OBJ_RECORD_OBJECT)phAnyRecordArray[i];

ulParamCopyCount = ulParameterCount - ulParameterIndex;
Expand All @@ -1730,6 +1737,16 @@ DslhWmpdoMpaGetParameterValues
bFromAcs,
writeID
);
if ( returnStatus != ANSC_STATUS_SUCCESS )
{
goto EXIT3;
}

if ( ulParamCopyCount > (ulParameterCount - ulParameterIndex) )
{
returnStatus = ANSC_STATUS_BAD_PARAMETER;
goto EXIT3;
}

ulParameterIndex += ulParamCopyCount;
}
Expand Down Expand Up @@ -1784,9 +1801,12 @@ DslhWmpdoMpaGetParameterValues

if( ppValueArray[ulSameObj] == NULL)
{
break;
returnStatus = ANSC_STATUS_RESOURCES;
goto EXIT2;
}

SlapInitVariable(ppValueArray[ulSameObj]);

pVarEntity = (PDSLH_VAR_ENTITY_OBJECT)pVarRecord->hDslhVarEntity;

ppValueArray[ulSameObj]->Name = pVarRecord->GetFullName((ANSC_HANDLE)pVarRecord);
Expand Down Expand Up @@ -1834,8 +1854,13 @@ DslhWmpdoMpaGetParameterValues

for( j = 0 ; j < ulSameObj; j ++)
{
if ( ulParameterIndex >= ulParameterCount )
{
returnStatus = ANSC_STATUS_BAD_PARAMETER;
goto EXIT3;
}
/* copy the value back */
pParameterValueArray[ulParameterIndex].Name = ppValueArray[j]->Name;
pParameterValueArray[ulParameterIndex].Name = AnscCloneString(ppValueArray[j]->Name);
pParameterValueArray[ulParameterIndex].Value = ppValueArray[j];
ppValueArray[j]->Name = NULL;

Expand Down
5 changes: 5 additions & 0 deletions source/ccsp/components/common/MessageBusHelper/helper/messagebus_interface_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,11 @@ CcspCcMbi_GetParameterValues
{
for ( i = 0; i < ulArraySize; i++ )
{
if (pParamValueArray[i].Name == NULL)
{
AnscTraceWarning(("CcspCcMbi_GetParameterValues cleanup stopped at index %lu (NULL Name)\n", i));
break;
}
DslhCwmpCleanParamValue((&pParamValueArray[i]));
}

Expand Down
Loading