From 20a2f3b9e7e9bf2233a0ea5a024ffe48961f97dd Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sun, 12 Jan 2020 17:35:50 +0000 Subject: [PATCH] [XP driver] Using unsigned for timer call counters, to avoid UB on overflow --- src/plugins/simulator/xplane/simulatorxplane.cpp | 2 +- src/plugins/simulator/xplane/simulatorxplane.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 80e8f0e8c..1722a6af5 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -366,7 +366,7 @@ namespace BlackSimPlugin } // FPS - if ((m_slowTimerCalls % 5) == 0) + if ((m_slowTimerCalls % 5u) == 0u) { // reading FPS resets average, so we only monitor over some time m_serviceProxy->getFrameStats(&m_averageFps, &m_simTimeRatio); diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 62501f6ba..49307b8f1 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -250,8 +250,8 @@ namespace BlackSimPlugin QTimer m_slowTimer; QTimer m_airportUpdater; QTimer m_pendingAddedTimer; - int m_fastTimerCalls = 0; //!< how often called - int m_slowTimerCalls = 0; //!< how often called + unsigned int m_fastTimerCalls = 0; //!< how often called + unsigned int m_slowTimerCalls = 0; //!< how often called BlackMisc::Aviation::CAirportList m_airportsInRange; //!< aiports in range of own aircraft BlackMisc::Simulation::CSimulatedAircraftList m_pendingToBeAddedAircraft; //!< aircraft to be added