Reentrancy: Avoid reentrant callbacks

[adns.git] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index 3419cd6a5134f2157d710b541825ffa436d2ea36..e853ab797e36139b015a3f1bb628fd6a38fa3377 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -558,6 +558,7 @@ static int init_begin(adns_state *ads_r, adns_initflags flags,
   LIST_INIT(ads->tcpw);
   LIST_INIT(ads->childw);
   LIST_INIT(ads->output);
   LIST_INIT(ads->tcpw);
   LIST_INIT(ads->childw);
   LIST_INIT(ads->output);

+  LIST_INIT(ads->intdone);

   ads->forallnext= 0;
   ads->nextid= 0x311f;
   ads->nudp= 0;
   ads->forallnext= 0;
   ads->nextid= 0x311f;
   ads->nudp= 0;


@@ -729,6 +730,7 @@ void adns_finish(adns_state ads) {
     else if (ads->tcpw.head) adns__cancel(ads->tcpw.head);
     else if (ads->childw.head) adns__cancel(ads->childw.head);
     else if (ads->output.head) adns__cancel(ads->output.head);
     else if (ads->tcpw.head) adns__cancel(ads->tcpw.head);
     else if (ads->childw.head) adns__cancel(ads->childw.head);
     else if (ads->output.head) adns__cancel(ads->output.head);

+    else if (ads->intdone.head) adns__cancel(ads->output.head);

     else break;
   }
   for (i=0; i<ads->nudp; i++) close(ads->udpsocket[i].fd);
     else break;
   }
   for (i=0; i<ads->nudp; i++) close(ads->udpsocket[i].fd);