GitHub/qpcpp
1
0
Fork 0
mirror of https://github.com/QuantumLeaps/qpcpp.git synced 2025-01-14 05:42:57 +08:00
Code Issues Projects Releases Wiki Activity

6.9.2a

Browse Source 
Fixed potential race condition in qs_rx.cpp
This commit is contained in:
MMS 2021-03-04 08:42:46 -05:00
parent 9d9b905515
commit 9717997ce4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qs/qs_rx.cpp
View File

@ -4,7 +4,7 @@
/// @cond
///***************************************************************************
/// Last updated for version 6.9.2a
/// Last updated on 2021-02-19
/// Last updated on 2021-01-28
///
/// Q u a n t u m L e a P s
/// ------------------------
@ -349,9 +349,8 @@ void QS::queryCurrObj(std::uint8_t obj_kind) noexcept {
QS::rxPriv_.currObj[obj_kind])->m_interval);
QS_SIG_PRE_(reinterpret_cast<QTimeEvt *>(
QS::rxPriv_.currObj[obj_kind])->sig);
QS_U8_PRE_ (QF_EVT_REF_CTR_(
reinterpret_cast<QTimeEvt *>(
QS::rxPriv_.currObj[obj_kind])));
QS_U8_PRE_ (reinterpret_cast<QTimeEvt *>(
QS::rxPriv_.currObj[obj_kind])->refCtr_);
break;
default:
break;
@ -369,14 +368,15 @@ void QS::queryCurrObj(std::uint8_t obj_kind) noexcept {
//****************************************************************************
void QS::rxParse(void) {
QSCtr head = rxPriv_.head;
while (head != rxPriv_.tail) { // QS-RX buffer NOT empty?
std::uint8_t b = rxPriv_.buf[rxPriv_.tail];
QSCtr tail = rxPriv_.tail;
while (rxPriv_.head != tail) { // QS-RX buffer NOT empty?
std::uint8_t b = rxPriv_.buf[tail];
++rxPriv_.tail;
if (rxPriv_.tail == rxPriv_.end) {
rxPriv_.tail = 0U;
++tail;
if (tail == rxPriv_.end) {
tail = 0U;
}
rxPriv_.tail = tail; // update the tail to a *valid* index
if (l_rx.esc != 0U) { // escaped byte arrived?
l_rx.esc = 0U;