From 58e5f5668e71615e2559afbb3b013ee29a7b90b4 Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Tue, 3 Jul 2012 17:13:01 +0000
Subject: [PATCH] Bug fix: check if pAxis is null in several places

---
 motorApp/MotorSrc/asynMotorController.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/motorApp/MotorSrc/asynMotorController.cpp b/motorApp/MotorSrc/asynMotorController.cpp
index 08ddb52c..05a6d41e 100644
--- a/motorApp/MotorSrc/asynMotorController.cpp
+++ b/motorApp/MotorSrc/asynMotorController.cpp
@@ -144,6 +144,7 @@ void asynMotorController::report(FILE *fp, int level)
 
   for (axis=0; axis<numAxes_; axis++) {
     pAxis = getAxis(axis);
+    if (!pAxis) continue; 
     pAxis->report(fp, level);
   }
 
@@ -719,6 +720,7 @@ asynStatus asynMotorController::initializeProfile(size_t maxProfilePoints)
   profileTimes_ = (double *)calloc(maxProfilePoints, sizeof(double));
   for (axis=0; axis<numAxes_; axis++) {
     pAxis = getAxis(axis);
+    if (!pAxis) continue;
     pAxis->initializeProfile(maxProfilePoints);
   }
   return asynSuccess;
@@ -747,6 +749,7 @@ asynStatus asynMotorController::buildProfile()
   }
   for (i=0; i<numAxes_; i++) {
     pAxis = getAxis(i);
+    if (!pAxis) continue;
     pAxis->buildProfile();
   }
   return asynSuccess;
@@ -761,6 +764,7 @@ asynStatus asynMotorController::executeProfile()
   
   for (axis=0; axis<numAxes_; axis++) {
     pAxis = getAxis(axis);
+    if (!pAxis) continue;
     pAxis->executeProfile();
   }
   return asynSuccess;
@@ -775,6 +779,7 @@ asynStatus asynMotorController::abortProfile()
   
   for (axis=0; axis<numAxes_; axis++) {
     pAxis = getAxis(axis);
+    if (!pAxis) continue;
     pAxis->abortProfile();
   }
   return asynSuccess;
@@ -789,6 +794,7 @@ asynStatus asynMotorController::readbackProfile()
   
   for (axis=0; axis<numAxes_; axis++) {
     pAxis = getAxis(axis);
+    if (!pAxis) continue;
     pAxis->readbackProfile();
   }
   return asynSuccess;