From ec79b4c8e48326f97935576105fe2e03b990b6c3 Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Tue, 27 Nov 2018 11:30:04 +0100 Subject: [PATCH] app: fixup error handling in wait_subsystem_init RPC We could call spdk_jsonrpc_end_result with a NULL result parameter, which will hit an assert. While here, also remove the "no memory" error message if the result object can't be obtained. Getting no result is not necessarily caused by memory allocation failure and everywhere throughout the SPDK we don't print any message if that happens. Change-Id: I4618b211192aa1c1d47fd850d17497d3ff9888ea Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.gerrithub.io/435112 Chandler-Test-Pool: SPDK Automated Test System Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris Tested-by: SPDK CI Jenkins --- lib/event/app.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/event/app.c b/lib/event/app.c index b7aefa474..de2f29443 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -1035,12 +1035,10 @@ spdk_rpc_subsystem_init_poller_ctx(void *ctx) if (spdk_rpc_get_state() == SPDK_RPC_RUNTIME) { w = spdk_jsonrpc_begin_result(poller_ctx->request); - if (w == NULL) { - SPDK_ERRLOG("Unable to allocate memory for RPC response\n"); - } else { + if (w != NULL) { spdk_json_write_bool(w, true); + spdk_jsonrpc_end_result(poller_ctx->request, w); } - spdk_jsonrpc_end_result(poller_ctx->request, w); spdk_poller_unregister(&poller_ctx->init_poller); free(poller_ctx); }