From e16dc6ef2557387b016cb4e96d4735643f44fde7 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Wed, 1 Dec 2021 22:23:41 +0100 Subject: [PATCH] Initialize FlightRule when using default constructor The FlightRule enum of CFlightPlan was uninitialized when using the default constructor. This caused undefined behavior in some special cases while e.g. loading a SimBrief xml flightplan. --- src/blackmisc/aviation/flightplan.cpp | 2 -- src/blackmisc/aviation/flightplan.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp index ed59d85fe..15662fc99 100644 --- a/src/blackmisc/aviation/flightplan.cpp +++ b/src/blackmisc/aviation/flightplan.cpp @@ -210,8 +210,6 @@ namespace BlackMisc::Aviation return cats; } - CFlightPlan::CFlightPlan() { } - CFlightPlan::CFlightPlan(const CCallsign &callsign, const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao, const QDateTime &takeoffTimePlanned, const QDateTime &takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime, const PhysicalQuantities::CTime &fuelTime, const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, CFlightPlan::FlightRules flightRules, diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index fe22b9c43..a33963118 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -186,7 +186,7 @@ namespace BlackMisc::Aviation static constexpr int MaxRouteAndRemarksLength = 624; //!< Max.length for Route and Remarks //! Default constructor - CFlightPlan(); + CFlightPlan() = default; //! Constructor CFlightPlan(const CCallsign &callsign, @@ -472,7 +472,7 @@ namespace BlackMisc::Aviation CAltitude m_cruiseAltitude; QString m_cruiseAltitudeString; PhysicalQuantities::CSpeed m_cruiseTrueAirspeed; - FlightRules m_flightRules; + FlightRules m_flightRules{}; QString m_route; CFlightPlanRemarks m_remarks;