From 62be7ac1475b8f85a3dcf27ec4eab157b230a984 Mon Sep 17 00:00:00 2001 From: Balazs Racz Date: Wed, 22 Nov 2023 15:48:07 +0100 Subject: [PATCH 1/2] Do not crash on an incoming message with 0 alias. --- src/openlcb/AliasCache.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openlcb/AliasCache.cxx b/src/openlcb/AliasCache.cxx index d1781229b..f32ea4362 100644 --- a/src/openlcb/AliasCache.cxx +++ b/src/openlcb/AliasCache.cxx @@ -515,6 +515,7 @@ NodeAlias AliasCache::lookup(NodeID id) */ NodeID AliasCache::lookup(NodeAlias alias) { + if (alias == 0) return 0; HASSERT(alias != 0); auto it = aliasMap.find(alias); From 296f0f9e5549932f33e998717927afa24ae983b0 Mon Sep 17 00:00:00 2001 From: Balazs Racz Date: Wed, 22 Nov 2023 15:49:37 +0100 Subject: [PATCH 2/2] Fix style. --- src/openlcb/AliasCache.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openlcb/AliasCache.cxx b/src/openlcb/AliasCache.cxx index f32ea4362..a507871f0 100644 --- a/src/openlcb/AliasCache.cxx +++ b/src/openlcb/AliasCache.cxx @@ -515,8 +515,10 @@ NodeAlias AliasCache::lookup(NodeID id) */ NodeID AliasCache::lookup(NodeAlias alias) { - if (alias == 0) return 0; - HASSERT(alias != 0); + if (alias == 0) + { + return 0; + } auto it = aliasMap.find(alias);