libs/SOEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix possible SM overwrite

Browse Source
This commit is contained in:
Mikael Heden 2016-02-17 10:57:48 +01:00
parent 918a6bad97
commit ec1cc7a4ed
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soem/ethercatcoe.c
View File

@ -856,13 +856,11 @@ int ecx_readPDOmap(ecx_contextt *context, uint16 Slave, int *Osize, int *Isize)
/* positive result from slave ? */ /* positive result from slave ? */
if ((wkc > 0) && (nSM > 2)) if ((wkc > 0) && (nSM > 2))
{ {
/* make nSM equal to number of defined SM */
nSM--;
/* limit to maximum number of SM defined, if true the slave can't be configured */ /* limit to maximum number of SM defined, if true the slave can't be configured */
if (nSM > EC_MAXSM) if (nSM > EC_MAXSM)
nSM = EC_MAXSM; nSM = EC_MAXSM;
/* iterate for every SM type defined */ /* iterate for every SM type defined */
for (iSM = 2 ; iSM <= nSM ; iSM++) for (iSM = 2 ; iSM < nSM ; iSM++)
{ {
rdl = sizeof(tSM); tSM = 0; rdl = sizeof(tSM); tSM = 0;
/* read SyncManager Communication Type */ /* read SyncManager Communication Type */
@ -958,8 +956,7 @@ int ecx_readPDOmapCA(ecx_contextt *context, uint16 Slave, int *Osize, int *Isize
/* positive result from slave ? */ /* positive result from slave ? */
if ((wkc > 0) && (context->SMcommtype->n > 2)) if ((wkc > 0) && (context->SMcommtype->n > 2))
{ {
/* make nSM equal to number of defined SM */ nSM = context->SMcommtype->n;
nSM = context->SMcommtype->n - 1;
/* limit to maximum number of SM defined, if true the slave can't be configured */ /* limit to maximum number of SM defined, if true the slave can't be configured */
if (nSM > EC_MAXSM) if (nSM > EC_MAXSM)
{ {
@ -967,7 +964,7 @@ int ecx_readPDOmapCA(ecx_contextt *context, uint16 Slave, int *Osize, int *Isize
ecx_packeterror(context, Slave, 0, 0, 10); /* #SM larger than EC_MAXSM */ ecx_packeterror(context, Slave, 0, 0, 10); /* #SM larger than EC_MAXSM */
} }
/* iterate for every SM type defined */ /* iterate for every SM type defined */
for (iSM = 2 ; iSM <= nSM ; iSM++) for (iSM = 2 ; iSM < nSM ; iSM++)
{ {
tSM = context->SMcommtype->SMtype[iSM]; tSM = context->SMcommtype->SMtype[iSM];