Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[glass] Fix NT view UpdateClients() bug (#4808)

Browse Source 
If UpdateClients() was called in the same update batch as an entry
removal, it could crash in GetEntry() due to a null entry caused by
deletion before a removal erase pass was made.
This commit is contained in:
Peter Johnson
2022-12-12 23:38:36 -08:00
committed by GitHub
parent 3270d4fc86
commit 967b30de3a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
glass/src/libnt/native/cpp/NetworkTables.cpp
View File

@@ -478,6 +478,10 @@ void NetworkTablesModel::Update() {
entry->info.type_str == "msgpack") {
// meta topic handling
if (entry->info.name == "$clients") {
// need to remove deleted entries as UpdateClients() uses GetEntry()
if (updateTree) {
std::erase(m_sortedEntries, nullptr);
}
UpdateClients(entry->value.GetRaw());
} else if (entry->info.name == "$serverpub") {
m_server.UpdatePublishers(entry->value.GetRaw());
@@ -505,9 +509,7 @@ void NetworkTablesModel::Update() {
}
// remove deleted entries
m_sortedEntries.erase(
std::remove(m_sortedEntries.begin(), m_sortedEntries.end(), nullptr),
m_sortedEntries.end());
std::erase(m_sortedEntries, nullptr);
RebuildTree();
}