[devel] [PATCH 1 of 1] amfd : fix amfd crash while updating saAmfSGMaxActiveSIsperSU [#1210]

[<pra...@or...>]

 osaf/services/saf/amf/amfd/sg.cc |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)


diff --git a/osaf/services/saf/amf/amfd/sg.cc b/osaf/services/saf/amf/amfd/sg.cc
--- a/osaf/services/saf/amf/amfd/sg.cc
+++ b/osaf/services/saf/amf/amfd/sg.cc
@@ -554,6 +554,7 @@ static SaAisErrorT ccb_completed_modify_
 	AVD_SG *sg;
 	const SaImmAttrModificationT_2 *attr_mod;
 	int i = 0;
+	bool value_is_deleted = false;
 
 	TRACE_ENTER2("'%s'", opdata->objectName.value);
 
@@ -651,15 +652,17 @@ static SaAisErrorT ccb_completed_modify_
 			/* Attribute value removed */
 			if ((attr_mod->modType == SA_IMM_ATTR_VALUES_DELETE) ||
 					(attribute->attrValues == NULL))
-				continue;
-
-			value = attribute->attrValues[0];
+				value_is_deleted = true;
+			else
+				value = attribute->attrValues[0];
 
 			if (!strcmp(attribute->attrName, "saAmfSGSuRestartProb")) {
 			} else if (!strcmp(attribute->attrName, "saAmfSGSuRestartMax")) {
 			} else if (!strcmp(attribute->attrName, "saAmfSGCompRestartProb")) {
 			} else if (!strcmp(attribute->attrName, "saAmfSGCompRestartMax")) {
 			} else if (!strcmp(attribute->attrName, "saAmfSGNumPrefInserviceSUs")) {
+				if (value_is_deleted == true)
+					continue;
 				uint32_t pref_inservice_su;
 				pref_inservice_su = *((SaUint32T *)value);
 
@@ -673,6 +676,8 @@ static SaAisErrorT ccb_completed_modify_
 					goto done;
 				}
 			} else if (!strcmp(attribute->attrName, "saAmfSGAutoRepair")) {
+				if (value_is_deleted == true)
+					continue;
 				uint32_t sg_autorepair = *((SaUint32T *)attribute->attrValues[0]);
 				if (sg_autorepair > SA_TRUE) {
 					report_ccb_validation_error(opdata,
@@ -681,11 +686,15 @@ static SaAisErrorT ccb_completed_modify_
 					goto done;
 				}
 			} else if (!strcmp(attribute->attrName, "saAmfSGSuHostNodeGroup")) {
+				if (value_is_deleted == true)
+					continue;
 				if (ng_change_is_valid(sg, (SaNameT *)value, opdata) == false) {
 					rc = SA_AIS_ERR_BAD_OPERATION;
 					goto done;
 				}
 			} else if (!strcmp(attribute->attrName, "saAmfSGNumPrefActiveSUs")) {
+				if (value_is_deleted == true)
+					continue;
 				uint32_t pref_active_su = *static_cast<SaUint32T *>(value);
 
 				if (sg->sg_redundancy_model != SA_AMF_NPM_REDUNDANCY_MODEL) {