RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 2aa62c1e01 into cef1360e05

Browse Source
pull/71/merge
devotip 7 years ago committed by GitHub
parent cef1360e05 2aa62c1e01
commit 6cedb7d3b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
src/iec61850/server/impl/ied_server.c
Unescape Escape View File

@ -1371,7 +1371,7 @@ IedServer_getFunctionalConstrainedData(IedServer self, DataObject* dataObject, F
} }
strncpy(domainName, self->model->name, 64); strncpy(domainName, self->model->name, 64);
strncat(domainName, ld->name, 64); strncat(domainName, ld->name, 64 - strlen(domainName));
MmsDomain* domain = MmsDevice_getDomain(self->mmsDevice, domainName); MmsDomain* domain = MmsDevice_getDomain(self->mmsDevice, domainName);

4
src/iec61850/server/model/model.c
Unescape Escape View File

@ -114,7 +114,7 @@ IedModel_lookupDataSet(IedModel* self, const char* dataSetReference /* e.g. ied
domainName[modelNameLen] = 0; domainName[modelNameLen] = 0;
strncat(domainName, dataSet->logicalDeviceName, 64); strncat(domainName, dataSet->logicalDeviceName, 64 - modelNameLen);
if (strncmp(domainName, dataSetReference, ldNameLen) == 0) { if (strncmp(domainName, dataSetReference, ldNameLen) == 0) {
if (strcmp(dataSet->name, separator + 1) == 0) { if (strcmp(dataSet->name, separator + 1) == 0) {
@ -138,7 +138,7 @@ IedModel_getDevice(IedModel* self, const char* deviceName)
char domainName[65]; char domainName[65];
strncpy(domainName, self->name, 64); strncpy(domainName, self->name, 64);
strncat(domainName, device->name, 64); strncat(domainName, device->name, 64 - strlen(domainName));
if (strcmp(domainName, deviceName) == 0) if (strcmp(domainName, deviceName) == 0)
return device; return device;

Write Preview
Loading…
Cancel
Save