From ed81e51cc1633cecfef05b84c0595418db8a384b Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 27 Jul 2016 11:45:49 +1000 Subject: [PATCH] ctdb-daemon: Fix CID 1364527/8/9: Null pointer dereferences (NULL_RETURNS) Signed-off-by: Martin Schwenke Reviewed-by: Volker Lendecke --- ctdb/server/ctdb_daemon.c | 8 ++++++++ ctdb/server/ctdbd.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 816766796b4..267d8994dd6 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -1263,6 +1263,10 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork) } ctdb->ev = tevent_context_init(NULL); + if (ctdb->ev == NULL) { + DEBUG(DEBUG_ALERT,("tevent_context_init() failed\n")); + exit(1); + } tevent_loop_allow_nesting(ctdb->ev); tevent_set_trace_callback(ctdb->ev, ctdb_tevent_trace, ctdb); ret = ctdb_init_tevent_logging(ctdb); @@ -1849,6 +1853,10 @@ int switch_from_server_to_client(struct ctdb_context *ctdb, const char *fmt, ... /* get a new event context */ ctdb->ev = tevent_context_init(ctdb); + if (ctdb->ev == NULL) { + DEBUG(DEBUG_ALERT,("tevent_context_init() failed\n")); + exit(1); + } tevent_loop_allow_nesting(ctdb->ev); /* Connect to main CTDB daemon */ diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index e09611f8e50..aecb7e05259 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -174,6 +174,10 @@ int main(int argc, const char *argv[]) fault_setup(); ev = tevent_context_init(NULL); + if (ev == NULL) { + DEBUG(DEBUG_ALERT,("tevent_context_init() failed\n")); + exit(1); + } tevent_loop_allow_nesting(ev); ctdb = ctdb_cmdline_init(ev); -- 2.11.4.GIT