lin-epics-modules/sinqepicsapp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bad logic in devScalerEL7373.c:connectSlaveRecords() which caused a core dump when accessing non existing

Browse Source 
slave records
This commit is contained in:
koennecke
2017-07-25 08:01:27 +02:00
parent 7263a0772f
commit 0eed0c9357
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sinqEPICSApp/src/devScalerEL737.c
View File

@ -112,12 +112,14 @@ static void connectSlaveRecords(EL737priv *priv)
char slaveName[PVNAME_SZ], errName[256]; char slaveName[PVNAME_SZ], errName[256];
long status; long status;
priv->dbInit = 1;
snprintf(slaveName,sizeof(slaveName),"%s:Pause", priv->psr->name); snprintf(slaveName,sizeof(slaveName),"%s:Pause", priv->psr->name);
errlogPrintf("Name of pause variable: %s\n", slaveName); errlogPrintf("Name of pause variable: %s\n", slaveName);
status = dbNameToAddr(slaveName,&priv->pause); status = dbNameToAddr(slaveName,&priv->pause);
if(status!= 0){ if(status!= 0){
errSymLookup(status,errName,sizeof(errName)); errSymLookup(status,errName,sizeof(errName));
errlogPrintf("dbNameToAddr failed for %s with %s\n", slaveName, errName); errlogPrintf("dbNameToAddr failed for %s with %s\n", slaveName, errName);
priv->dbInit = 0;
} else { } else {
errlogPrintf("dbNameToAddr succeded for %s, record access %s\n",slaveName, priv->pause.precord->name); errlogPrintf("dbNameToAddr succeded for %s, record access %s\n",slaveName, priv->pause.precord->name);
} }
@ -128,6 +130,7 @@ static void connectSlaveRecords(EL737priv *priv)
if(status!= 0){ if(status!= 0){
errSymLookup(status,errName,sizeof(errName)); errSymLookup(status,errName,sizeof(errName));
errlogPrintf("dbNameToAddr failed for %s with %s\n", slaveName, errName); errlogPrintf("dbNameToAddr failed for %s with %s\n", slaveName, errName);
priv->dbInit = 0;
} else { } else {
errlogPrintf("dbNameToAddr succeded for %s, record access %s\n",slaveName, priv->msgTxt.precord->name); errlogPrintf("dbNameToAddr succeded for %s, record access %s\n",slaveName, priv->msgTxt.precord->name);
} }
@ -138,11 +141,10 @@ static void connectSlaveRecords(EL737priv *priv)
if(status!= 0){ if(status!= 0){
errSymLookup(status,errName,sizeof(errName)); errSymLookup(status,errName,sizeof(errName));
errlogPrintf("dbNameToAddr failed for %s with %s\n", slaveName, errName); errlogPrintf("dbNameToAddr failed for %s with %s\n", slaveName, errName);
priv->dbInit = 0;
} else { } else {
errlogPrintf("dbNameToAddr succeded for %s, record access %s\n",slaveName, priv->status.precord->name); errlogPrintf("dbNameToAddr succeded for %s, record access %s\n",slaveName, priv->status.precord->name);
} }
priv->dbInit = 1;
} }
static long el737_init_record(scalerRecord *psr, CALLBACK *pcallback) static long el737_init_record(scalerRecord *psr, CALLBACK *pcallback)