Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

Commit bb26778

Browse files
John KordichJohn Kordich
authored andcommitted
Valgrind is coming up pretty sparse now after these fixes.
1 parent c6231a4 commit bb26778

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

LCM/dsc/engine/ConfigurationManager/LocalConfigManagerHelper.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,6 +930,7 @@ MI_Result CallConsistencyEngine(
930930
result = MergePartialConfigurations(&lcmContext, moduleManager, GetPendingConfigFileName(), GetPartialConfigBaseDocumentInstanceFileName(), cimErrorDetails);
931931
if (result != MI_RESULT_OK)
932932
{
933+
MSFT_DSCMetaConfiguration_Delete((MSFT_DSCMetaConfiguration *)metaConfigInstance);
933934
moduleManager->ft->Close(moduleManager, NULL);
934935
SetLCMStatusReady(lcmContext, result);
935936
return result;
@@ -2477,7 +2478,11 @@ MI_Result ProcessPartialConfigurations(
24772478
{
24782479
DSC_WriteWarning2Param((MI_Context*) lcmContext->context, ID_LCMHELPER_APPLYPARTIALCONFIG_FAILED_WITHERROR, searchBucket.key, value.string);
24792480
}
2480-
*cimErrorDetails = NULL;//Clear error details
2481+
if (*cimErrorDetails != NULL)
2482+
{
2483+
MI_Instance_Delete(*cimErrorDetails);
2484+
*cimErrorDetails = NULL;//Clear error details
2485+
}
24812486
flagPartialConfigFailedToApply = MI_TRUE;
24822487
r = MI_RESULT_OK;
24832488
}

LCM/dsc/engine/ca/CAInfrastructure/WebPullClient.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2370,6 +2370,7 @@ static MI_Result GetModuleNameVersionTable(MI_Char* mofFileLocation,
23702370
r = MI_Deserializer_DeserializeInstanceArray(&deserializer, 0, &options, 0, pbuffer, contentSize, &miClassArray, &readBytes, &miInstanceArray, extendedError);
23712371
if (r != MI_RESULT_OK)
23722372
{
2373+
DSC_free(miApp);
23732374
return r;
23742375
}
23752376

@@ -2379,7 +2380,6 @@ static MI_Result GetModuleNameVersionTable(MI_Char* mofFileLocation,
23792380
pbuffer = NULL;
23802381
}
23812382

2382-
23832383
for (i = 0; i < miInstanceArray->size; ++i)
23842384
{
23852385
// compare classname with BASE_DOCUMENT_CLASSNAME. Skip if same
@@ -2457,6 +2457,7 @@ static MI_Result GetModuleNameVersionTable(MI_Char* mofFileLocation,
24572457
MI_Deserializer_Close(&deserializer);
24582458
MI_OperationOptions_Delete(&options);
24592459
CleanUpDeserializerInstanceCache(miInstanceArray);
2460+
DSC_free(miApp);
24602461
return GetCimMIError2Params(MI_RESULT_FAILED, extendedError, ID_PULL_INVALIDMODULEVERSION, moduleVersion.string, moduleName.string);
24612462
}
24622463
}
@@ -2468,6 +2469,7 @@ static MI_Result GetModuleNameVersionTable(MI_Char* mofFileLocation,
24682469
MI_OperationOptions_Delete(&options);
24692470

24702471
CleanUpDeserializerInstanceCache(miInstanceArray);
2472+
DSC_free(miApp);
24712473

24722474
return MI_RESULT_OK;
24732475
}

0 commit comments

Comments
 (0)