aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-11-29 17:11:43 +0100
committerGitHub <noreply@github.com>2021-11-29 17:11:43 +0100
commitf938eaa29672f357ce7b4f7f442923c0b5427b5f (patch)
tree4c1b0d0cb4088e9db26f3591aa886447d42ed36b
parent0ab4273e77bd8ca6dd559c75c705715ff8fb00f7 (diff)
parent00fd1a358996facad9b8cb26e092aa72e7037949 (diff)
Merge pull request #20277 from vespa-engine/geirst/protection-against-nullptr-executor
Add protection against executor being nullptr.
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp b/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp
index 8b34775b65d..2bccbe468ce 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/executor_explorer_utils.cpp
@@ -85,6 +85,9 @@ convert_executor_to_slime(const ThreadExecutor* executor, Cursor& object)
void
convert_executor_to_slime(const ISequencedTaskExecutor* executor, Cursor& object)
{
+ if (executor == nullptr) {
+ return;
+ }
if (const auto* seq = dynamic_cast<const SequencedTaskExecutor*>(executor)) {
convert_sequenced_executor_to_slime(*seq, object);
} else if (const auto* ada = dynamic_cast<const AdaptiveSequencedExecutor*>(executor)) {