diff options
author | Stephen Gallagher <sgallagh@redhat.com> | 2010-06-09 10:04:44 -0400 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-06-10 10:17:38 -0400 |
commit | bb1487fef5d19a7b1536fc42e25a08f7d4c43e1b (patch) | |
tree | eeee7524c49b3f3dcb0cdfa5f8c6758a985e6bb3 /src | |
parent | a40b812b63e9f32c946761cb9cb7315ee57376ed (diff) | |
download | sssd-bb1487fef5d19a7b1536fc42e25a08f7d4c43e1b.tar.gz sssd-bb1487fef5d19a7b1536fc42e25a08f7d4c43e1b.tar.xz sssd-bb1487fef5d19a7b1536fc42e25a08f7d4c43e1b.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/monitor/monitor.c | 4 | ||||
-rw-r--r-- | src/providers/data_provider_callbacks.c | 2 | ||||
-rw-r--r-- | 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 e52d79349..bda45dc47 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; } |