[glass] Check for null entries when updating struct/proto (wpilibsuit…

…e#6059)
rzblue · Dec 18, 2023 · f029841 · f029841
1 parent a004c9e
commit f029841
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/glass/src/libnt/native/cpp/NetworkTables.cpp b/glass/src/libnt/native/cpp/NetworkTables.cpp
@@ -879,7 +879,10 @@ void NetworkTablesModel::Update() {
           } else if (desc->IsValid()) {
             // loop over all entries with this type and update
             for (auto&& entryPair : m_entries) {
-              auto ts = entryPair.second->info.type_str;
+              if (!entryPair.second) {
+                continue;
+              }
+              std::string_view ts = entryPair.second->info.type_str;
               if (!wpi::starts_with(ts, "struct:")) {
                 continue;
               }
@@ -901,7 +904,10 @@ void NetworkTablesModel::Update() {
           } else {
             // loop over all protobuf entries and update (conservatively)
             for (auto&& entryPair : m_entries) {
-              auto& ts = entryPair.second->info.type_str;
+              if (!entryPair.second) {
+                continue;
+              }
+              std::string_view ts = entryPair.second->info.type_str;
               if (wpi::starts_with(ts, "proto:")) {
                 entryPair.second->UpdateFromValue(*this);
               }