Merge pull request #4797 from JoergAtGithub/hidoutputreportiteratorfix

Prevent incrementing map iterator, when iterator points to map end
mixxxdj · Jun 12, 2022 · cd7452c · cd7452c
2 parents 326ea88 + d26deb6
commit cd7452c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/controllers/hid/hidiothread.cpp b/src/controllers/hid/hidiothread.cpp
@@ -215,9 +215,13 @@ bool HidIoThread::sendNextCachedOutputReport() {
     // which only has the effect, that one additional lookup operation for unsent data will be executed.
     for (unsigned char i = 0; i < m_outputReports.size(); i++) {
         auto mapLock = lockMutex(&m_outputReportMapMutex);
-        m_outputReportIterator++;
         if (m_outputReportIterator == m_outputReports.end()) {
             m_outputReportIterator = m_outputReports.begin();
+        } else {
+            m_outputReportIterator++;
+            if (m_outputReportIterator == m_outputReports.end()) {
+                m_outputReportIterator = m_outputReports.begin();
+            }
         }
         mapLock.unlock();