Fix crash Stop and pNext (Makuna#15)

rudacs · Makuna · commit 399f11086685 · 2017-02-27T01:11:26.000-08:00
Crash occurs if you make a Stop and then a Start.
Then you should check if it's really running.

Set NULL in pNext pointer to avoid junk.
diff --git a/src/Task.h b/src/Task.h
@@ -57,7 +57,8 @@ class Task
     Task(uint32_t timeInterval) :
             _timeInterval(timeInterval),
             _remainingTime(0),
-            _taskState(TaskState_Stopped)
+            _taskState(TaskState_Stopped),
+            _pNext(NULL)
     {
     }
 
@@ -102,8 +103,11 @@ class Task
     }
     void Stop()
     {
-        OnStop();
-        _taskState = TaskState_Stopping;
+        if (_taskState == TaskState_Running)
+        {
+            OnStop();
+            _taskState = TaskState_Stopping;
+        }
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ class Task`
`57`	`57`	`Task(uint32_t timeInterval) :`
`58`	`58`	`_timeInterval(timeInterval),`
`59`	`59`	`_remainingTime(0),`
`60`		`- _taskState(TaskState_Stopped)`
	`60`	`+ _taskState(TaskState_Stopped),`
	`61`	`+ _pNext(NULL)`
`61`	`62`	`{`
`62`	`63`	`}`
`63`	`64`
`@@ -102,8 +103,11 @@ class Task`
`102`	`103`	`}`
`103`	`104`	`void Stop()`
`104`	`105`	`{`
`105`		`- OnStop();`
`106`		`- _taskState = TaskState_Stopping;`
	`106`	`+ if (_taskState == TaskState_Running)`
	`107`	`+ {`
	`108`	`+ OnStop();`
	`109`	`+ _taskState = TaskState_Stopping;`
	`110`	`+ }`
`107`	`111`	`}`
`108`	`112`	`};`
`109`	`113`