Skip to content

Commit 5fd64d4

Browse files
authored
Fix uninitialised memory read (adminModule) (meshtastic#6605)
1 parent 816d948 commit 5fd64d4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/graphics/Screen.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1796,7 +1796,9 @@ void Screen::setup()
17961796
powerStatusObserver.observe(&powerStatus->onNewStatus);
17971797
gpsStatusObserver.observe(&gpsStatus->onNewStatus);
17981798
nodeStatusObserver.observe(&nodeStatus->onNewStatus);
1799+
#if !MESHTASTIC_EXCLUDE_ADMIN
17991800
adminMessageObserver.observe(adminModule);
1801+
#endif
18001802
if (textMessageModule)
18011803
textMessageObserver.observe(textMessageModule);
18021804
if (inputBroker)
@@ -2857,4 +2859,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
28572859
} // namespace graphics
28582860
#else
28592861
graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
2860-
#endif // HAS_SCREEN
2862+
#endif // HAS_SCREEN

0 commit comments

Comments
 (0)