From a0c29342ed97d052d1d4e98558a71889645ff012 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 9 Jun 2010 10:04:44 -0400 Subject: Check the correct variable for NULL after creating timer In several places, we were creating a new timer and assigning it to the tev variable, but then we were checking for NULL from the te variable (which, incidentally, is guaranteed never to be NULL in this situation) https://fedorahosted.org/sssd/ticket/523 --- src/monitor/monitor.c | 4 ++-- src/providers/data_provider_callbacks.c | 2 +- src/responder/common/responder_dp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index acac12dba..91bcb9a11 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -1435,7 +1435,7 @@ static void process_config_file(struct tevent_context *ev, rw_ctx->file_ctx = file_ctx; tev = tevent_add_timer(ev, rw_ctx, tv, rewatch_config_file, rw_ctx); - if (te == NULL) { + if (tev == NULL) { DEBUG(0, ("Could not restore inotify watch. Quitting!\n")); close(file_ctx->mt_ctx->inotify_fd); kill(getpid(), SIGTERM); @@ -1488,7 +1488,7 @@ static void rewatch_config_file(struct tevent_context *ev, cb->filename, err, strerror(err))); tev = tevent_add_timer(ev, ev, tv, rewatch_config_file, rw_ctx); - if (te == NULL) { + if (tev == NULL) { DEBUG(0, ("Could not restore inotify watch. Quitting!\n")); close(file_ctx->mt_ctx->inotify_fd); kill(getpid(), SIGTERM); diff --git a/src/providers/data_provider_callbacks.c b/src/providers/data_provider_callbacks.c index 8ed2e5b60..9d8946a84 100644 --- a/src/providers/data_provider_callbacks.c +++ b/src/providers/data_provider_callbacks.c @@ -99,7 +99,7 @@ static void be_run_cb_step(struct tevent_context *ev, struct tevent_timer *te, tev = tevent_add_timer(cb_ctx->be->ev, cb_ctx, soon, be_run_cb_step, cb_ctx); - if (!te) { + if (!tev) { DEBUG(0, ("Out of memory. Could not invoke callbacks\n")); goto final; } diff --git a/src/responder/common/responder_dp.c b/src/responder/common/responder_dp.c index 9f8f5263d..a5c1c5100 100644 --- a/src/responder/common/responder_dp.c +++ b/src/responder/common/responder_dp.c @@ -155,7 +155,7 @@ static void sss_dp_invoke_callback(struct tevent_context *ev, tv = tevent_timeval_current(); tev = tevent_add_timer(sdp_req->ev, sdp_req, tv, sss_dp_invoke_callback, sdp_req); - if (!te) { + if (!tev) { /* Out of memory or other serious error */ goto done; } -- cgit