[Reconnoiter-devel] [reconnoiter commit] Reconnoiter branch, master, updated. add4f486f20b6917e51f1603859d657476297871

git at labs.omniti.com git at labs.omniti.com
Mon Apr 23 20:55:55 EDT 2012


Pushed by: jesus
The branch, master has been updated
       via  add4f486f20b6917e51f1603859d657476297871 (commit)
      from  c31fda3b71d255b654a5398ac37e568d05c66083 (commit)

Summary of changes:
 src/modules/dns.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Log:
commit add4f486f20b6917e51f1603859d657476297871
Author: Theo Schlossnagle <jesus at omniti.com>
Date:   Mon Apr 23 20:55:52 2012 -0400

    it possible to attempt to remove a NULL event in the dns module

diff --git a/src/modules/dns.c b/src/modules/dns.c
index b8c5992..0693547 100644
--- a/src/modules/dns.c
+++ b/src/modules/dns.c
@@ -344,10 +344,14 @@ static int dns_invoke_timeouts(eventer_t e, int mask, void *closure,
 static void eventer_dns_utm_fn(struct dns_ctx *ctx, int timeout, void *data) {
   dns_ctx_handle_t *h = data;
   eventer_t e = NULL, newe = NULL;
-  if(ctx == NULL) e = eventer_remove(h->timeout);
+  if(ctx == NULL) {
+    if(h->timeout) e = eventer_remove(h->timeout);
+  }
   else {
     assert(h->ctx == ctx);
-    if(timeout < 0) e = eventer_remove(h->timeout);
+    if(timeout < 0) {
+      if(h->timeout) e = eventer_remove(h->timeout);
+    }
     else {
       newe = eventer_alloc();
       newe->mask = EVENTER_TIMER;




hooks/post-receive
-- 
Reconnoiter


More information about the Reconnoiter-devel mailing list