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

Fixed segfault if an axis is misconfigured (i.e. is not a sinqAxis
All checks were successful
Test And Build / Lint (push) Successful in 6s
Details
Test And Build / Build (push) Successful in 5s
Details

Browse Source
This commit is contained in:
mathis_s
2025-12-23 11:42:46 +01:00
parent 1d1e562490
commit e234d05815
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sinqController.cpp
View File

@@ -439,10 +439,12 @@ asynStatus sinqController::writeInt32(asynUser *pasynUser, epicsInt32 value) {
sinqAxis *axis = getSinqAxis(pasynUser); sinqAxis *axis = getSinqAxis(pasynUser);
if (axis == nullptr) { if (axis == nullptr) {
int axisNo;
getAddress(pasynUser, &axisNo);
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR, asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d:\nAxis is not an " "Controller \"%s\", axis %d => %s, line %d:\nAxis is not an "
"instance of sinqAxis", "instance of sinqAxis",
portName, axis->axisNo(), __PRETTY_FUNCTION__, __LINE__); portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
return asynError; return asynError;
} }
@@ -462,10 +464,12 @@ asynStatus sinqController::readInt32(asynUser *pasynUser, epicsInt32 *value) {
sinqAxis *axis = getSinqAxis(pasynUser); sinqAxis *axis = getSinqAxis(pasynUser);
if (axis == nullptr) { if (axis == nullptr) {
int axisNo;
getAddress(pasynUser, &axisNo);
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR, asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d:\nAxis is not an " "Controller \"%s\", axis %d => %s, line %d:\nAxis is not an "
"instance of sinqAxis", "instance of sinqAxis",
portName, axis->axisNo(), __PRETTY_FUNCTION__, __LINE__); portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
return asynError; return asynError;
} }
@@ -495,7 +499,7 @@ asynStatus sinqController::couldNotParseResponse(const char *command,
asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR, asynPrint(this->pasynUserSelf, ASYN_TRACE_ERROR,
"Controller \"%s\", axis %d => %s, line %d:\nAxis is not an " "Controller \"%s\", axis %d => %s, line %d:\nAxis is not an "
"instance of sinqAxis", "instance of sinqAxis",
portName, axis->axisNo(), __PRETTY_FUNCTION__, __LINE__); portName, axisNo, __PRETTY_FUNCTION__, __LINE__);
return asynError; return asynError;
} }