Добавлена дополнительная защита при работе с памятью

Lipotam · Sep 4, 2017 · 9315e22 · 9315e22
1 parent 11c86e9
commit 9315e22
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/code/c++/cxx-api/AutoConnector.cpp b/code/c++/cxx-api/AutoConnector.cpp
@@ -1,6 +1,8 @@
 #include "AutoConnector.h"
 
-AutoConnector::AutoConnector(std::function<void()> c, uint32_t f) : callback(c), frequency(f) {
+AutoConnector::AutoConnector(std::function<void()> c, uint32_t f) : pConnectingThread(nullptr), callback(c),
+                                                                    frequency(f)
+{
 	isRepeat.store(false);
 }
 
@@ -9,7 +11,7 @@ AutoConnector::~AutoConnector() {
 }
 
 void AutoConnector::start() {
-	if (!isRepeat.load())
+	if (!isRepeat.load() && !pConnectingThread)
 	{
 		Data d;
 		d.callback = callback;
@@ -27,7 +29,7 @@ void AutoConnector::start() {
 }
 
 void AutoConnector::stop() {
-	if (isRepeat.load()) {
+	if (isRepeat.load() && pConnectingThread) {
 		isRepeat.store(false);
 		pConnectingThread->join();
 		delete pConnectingThread;

diff --git a/code/c++/cxx-api/TrackPlatform_Manager.h b/code/c++/cxx-api/TrackPlatform_Manager.h
@@ -9,7 +9,7 @@
 class TrackPlatform_Manager : public TrackPlatform_BasicManagement
 {
 	static TrackPlatform_BasicConnector* createConnectorByMode(ConnectionModes mode, const CommunicationInfoStruct& info);
-	AutoConnector* pAutoConnector;
+	AutoConnector* pAutoConnector = nullptr;
 
 public:
 	TrackPlatform_Manager(ConnectionModes mode, const CommunicationInfoStruct& info);