Check for nullptr in WallTimer::hasStarted() and SteadyTimer::hasStar…

…ted() Analogous to fe9479c (#1541).
ros · Jan 4, 2019 · a6bb2e3 · a6bb2e3
1 parent eb4e9b3
commit a6bb2e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/clients/roscpp/include/ros/steady_timer.h b/clients/roscpp/include/ros/steady_timer.h
@@ -71,9 +71,9 @@ class ROSCPP_DECL SteadyTimer
    */
   void setPeriod(const WallDuration& period, bool reset=true);
 
-  bool hasStarted() const { return impl_->hasStarted(); }
+  bool hasStarted() const { return impl_ && impl_->hasStarted(); }
   bool isValid() { return impl_ && impl_->isValid(); }
-  operator void*() { return isValid() ? (void *) 1 : (void *) 0; }
+  operator void*() { return isValid() ? (void*)1 : (void*)0; }
 
   bool operator<(const SteadyTimer& rhs)
   {

diff --git a/clients/roscpp/include/ros/wall_timer.h b/clients/roscpp/include/ros/wall_timer.h
@@ -71,7 +71,7 @@ class ROSCPP_DECL WallTimer
    */
   void setPeriod(const WallDuration& period, bool reset=true);
 
-  bool hasStarted() const { return impl_->hasStarted(); }
+  bool hasStarted() const { return impl_ && impl_->hasStarted(); }
   bool isValid() { return impl_ && impl_->isValid(); }
   operator void*() { return isValid() ? (void*)1 : (void*)0; }