ctdb-daemon: Fix CID 1364527/8/9: Null pointer dereferences (NULL_RETURNS)

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit ed81e51cc1633cecfef05b84c0595418db8a384b)

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 7bffefefe87822238c5b0d9db7c439170e87f553..906d418880185a55839604f708f5d491e412ce03 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -4383,6 +4383,10 @@ int switch_from_server_to_client(struct ctdb_context *ctdb, const char *fmt, ...
 
        /* get a new event context */
        ctdb->ev = event_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/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index ac2db7594c402448b560f446fbcde8bd647214d2..6d7edc2913d85db8e7bd63cd213ade784c0d95bf 100644 (file)
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1241,6 +1241,10 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
        }
 
        ctdb->ev = event_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);

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index ec285c043cce433d0257b5e6f390bbe24f59ca2e..bb15ea330cc0c1c8e91197e8da42ecca2486f3eb 100644 (file)
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -164,6 +164,10 @@ int main(int argc, const char *argv[])
        fault_setup();
 
        ev = event_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);