Fix other crashes

g4klx · Aug 20, 2018 · b66a92b · b66a92b
1 parent 713d12e
commit b66a92b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/P25Control.cpp b/P25Control.cpp
@@ -595,6 +595,10 @@ unsigned int CP25Control::readModem(unsigned char* data)
 void CP25Control::writeNetwork()
 {
 	unsigned char data[100U];
+
+	if (m_network == NULL)
+		return;
+
 	unsigned int length = m_network->read(data, 100U);
 	if (length == 0U)
 		return;

diff --git a/P25NID.cpp b/P25NID.cpp
@@ -98,7 +98,6 @@ CP25NID::~CP25NID()
 	delete[] m_term;
 	delete[] m_tsdu;
 	delete[] m_pdu;
-	delete[] m_tsdu;
 }
 
 bool CP25NID::decode(const unsigned char* data)

diff --git a/POCSAGControl.cpp b/POCSAGControl.cpp
@@ -97,7 +97,8 @@ unsigned int CPOCSAGControl::readModem(unsigned char* data)
 
 bool CPOCSAGControl::processData()
 {
-	assert(m_network != NULL);
+	if (m_network == NULL)
+		return false;
 
 	unsigned char data[300U];
 	unsigned int length = m_network->read(data);