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

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 816766796b4e4aaee0b8a6d0f2b27715faedce79..267d8994dd614d3f3aadc2b1d791198a42f0fac2 100644 (file)
--- 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 e09611f8e50ccc317b5d83f3031a133f16b95415..aecb7e05259054a0cdf6bed7e93b4820f8dabae8 100644 (file)
--- 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);