From d41975dde8061aa738f5854e2ab087ebd741e7d9 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 28 Nov 2019 14:33:00 +0200 Subject: [PATCH] MXS-2782 Return nullptr if non-existing worker is asked for Earlier assert in debug mode and garbage in release mode. --- server/core/routingworker.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/core/routingworker.cc b/server/core/routingworker.cc index 0d629af8d..26bc64c89 100644 --- a/server/core/routingworker.cc +++ b/server/core/routingworker.cc @@ -453,9 +453,9 @@ RoutingWorker* RoutingWorker::get(int worker_id) worker_id = this_unit.id_main_worker; } - mxb_assert((worker_id >= this_unit.id_min_worker) && (worker_id <= this_unit.id_max_worker)); + bool valid = (worker_id >= this_unit.id_min_worker && worker_id <= this_unit.id_max_worker); - return this_unit.ppWorkers[worker_id]; + return valid ? this_unit.ppWorkers[worker_id] : nullptr; } RoutingWorker* RoutingWorker::get_current()