From 968233b4958c2f8a5e0ddba3b4e87d4934c336c5 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 9 Sep 2015 13:43:08 -1000 Subject: [PATCH] Potential null-pointer dereference fix --- hecl/driver/ToolExtract.hpp | 4 ++++ hecl/extern/Athena | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hecl/driver/ToolExtract.hpp b/hecl/driver/ToolExtract.hpp index 9538cb045..61509ef9c 100644 --- a/hecl/driver/ToolExtract.hpp +++ b/hecl/driver/ToolExtract.hpp @@ -205,7 +205,11 @@ public: int width = HECL::ConsoleWidth(); int half = width / 2 - 2; + if (!message) + message = _S(""); size_t messageLen = HECL::StrLen(message); + if (!submessage) + submessage = _S(""); size_t submessageLen = HECL::StrLen(submessage); if (half - messageLen < submessageLen-2) submessageLen = 0; diff --git a/hecl/extern/Athena b/hecl/extern/Athena index 89fa92308..4ffce2dbc 160000 --- a/hecl/extern/Athena +++ b/hecl/extern/Athena @@ -1 +1 @@ -Subproject commit 89fa92308f6d2c8019a0e6202930aa721cba63bc +Subproject commit 4ffce2dbc3a48ba1fc8142456630d584ab32ec57