Merge pull request #96 from f1rmb/fix_gps_segfault

Fix segfault when GPS is not enabled in config (NULL reference usage).
This commit is contained in:
Jonathan Naylor 2020-11-04 10:38:55 +00:00 committed by GitHub
commit b68415fe64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1373,7 +1373,7 @@ bool CDMRGateway::createDMRNetwork1()
}
#if defined(USE_GPSD)
if (location)
if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork1);
#endif
@ -1540,7 +1540,7 @@ bool CDMRGateway::createDMRNetwork2()
}
#if defined(USE_GPSD)
if (location)
if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork2);
#endif
@ -1707,7 +1707,7 @@ bool CDMRGateway::createDMRNetwork3()
}
#if defined(USE_GPSD)
if (location)
if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork3);
#endif
@ -1874,7 +1874,7 @@ bool CDMRGateway::createDMRNetwork4()
}
#if defined(USE_GPSD)
if (location)
if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork4);
#endif
@ -2041,7 +2041,7 @@ bool CDMRGateway::createDMRNetwork5()
}
#if defined(USE_GPSD)
if (location)
if (location && (m_gpsd != NULL))
m_gpsd->addNetwork(m_dmrNetwork5);
#endif