Handled some potentially "dangerous" parsing issues for VATSIM file (no coordinate)

https://discordapp.com/channels/539048679160676382/539486489977946112/593081121512751116
This commit is contained in:
Klaus Basan
2019-06-25 23:54:55 +02:00
committed by Mat Sutcliffe
parent b2b85795e0
commit 4ecd8a78ad
4 changed files with 46 additions and 12 deletions

View File

@@ -251,9 +251,17 @@ namespace BlackMisc
template <class MU, class PQ>
PQ &CPhysicalQuantity<MU, PQ>::switchUnit(const MU &newUnit)
{
// NULL check: https://discordapp.com/channels/539048679160676382/539925070550794240/593151683698229258
if (m_unit == newUnit || this->isNull()) { return *derived(); }
m_value = newUnit.convertFrom(m_value, m_unit);
m_unit = newUnit;
if (newUnit.isNull())
{
this->setNull();
}
else
{
m_value = newUnit.convertFrom(m_value, m_unit);
m_unit = newUnit;
}
return *derived();
}