stv0g/libiec61850
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch

Browse source 
Conflicts:
	src/vs/libiec61850-wo-goose.def
This commit is contained in:
Michael Zillgith 2015-10-12 12:31:21 +02:00
commit cb24b57975
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mms/iso_mms/server/mms_get_namelist_service.c
View file

@ -436,9 +436,12 @@ mmsServer_handleGetNameListRequest(
else if (objectClass == OBJECT_CLASS_NAMED_VARIABLE_LIST) {
LinkedList nameList = getNamedVariableListsDomainSpecific(connection, domainSpecificName);
createNameListResponse(connection, invokeId, nameList, response, continueAfter);
LinkedList_destroy(nameList);
if (nameList == NULL)
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_NON_EXISTENT);
else {
createNameListResponse(connection, invokeId, nameList, response, continueAfter);
LinkedList_destroy(nameList);
}
}
#endif /* (MMS_DATA_SET_SERVICE == 1) */
@ -447,7 +450,6 @@ mmsServer_handleGetNameListRequest(
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_ACCESS_UNSUPPORTED);
}
}
else if (objectScope == OBJECT_SCOPE_VMD) { /* vmd-specific */