From cc6e7f956fcf3771180f0ab1748f4010ccd29583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Hofmann?= Date: Thu, 31 Mar 2022 09:43:55 +0200 Subject: [PATCH] Fix null pointer dereference --- SpaceCadetPinball/TPinballTable.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SpaceCadetPinball/TPinballTable.cpp b/SpaceCadetPinball/TPinballTable.cpp index e080369..e8cdbc4 100644 --- a/SpaceCadetPinball/TPinballTable.cpp +++ b/SpaceCadetPinball/TPinballTable.cpp @@ -460,7 +460,7 @@ int TPinballTable::Message(int code, float value) if (PlayerCount <= 1) { char* textboxText; - if (Demo->ActiveFlag) + if (Demo && Demo->ActiveFlag) textboxText = pinball::get_rc_string(30, 0); else textboxText = pinball::get_rc_string(26, 0); @@ -504,25 +504,25 @@ int TPinballTable::Message(int code, float value) switch (nextPlayer) { case 0: - if (Demo->ActiveFlag) + if (Demo && Demo->ActiveFlag) textboxText = pinball::get_rc_string(30, 0); else textboxText = pinball::get_rc_string(26, 0); break; case 1: - if (Demo->ActiveFlag) + if (Demo && Demo->ActiveFlag) textboxText = pinball::get_rc_string(31, 0); else textboxText = pinball::get_rc_string(27, 0); break; case 2: - if (Demo->ActiveFlag) + if (Demo && Demo->ActiveFlag) textboxText = pinball::get_rc_string(32, 0); else textboxText = pinball::get_rc_string(28, 0); break; case 3: - if (Demo->ActiveFlag) + if (Demo && Demo->ActiveFlag) textboxText = pinball::get_rc_string(33, 0); else textboxText = pinball::get_rc_string(29, 0);