Commit 5fc80f8f authored by Per Cederqvist's avatar Per Cederqvist
Browse files

Merged R0.98.3

parent 2de699a3
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
** 920129 pen added support for "lazy" connect() ** 920129 pen added support for "lazy" connect()
** 920209 pen reworked some of the code ** 920209 pen reworked some of the code
** 920209 pen TCP and UDP specific code removed. ** 920209 pen TCP and UDP specific code removed.
** 930117 pen Two memory leak bugs fixed (found by Ceder)
*/ */
#include <sys/types.h> #include <sys/types.h>
...@@ -186,7 +187,7 @@ isc_remove(IscMaster *mcb, ...@@ -186,7 +187,7 @@ isc_remove(IscMaster *mcb,
} }
isc_free(isl); isc_free(isl);
return --scb->nlinks; return --scb->nlinks;
} }
...@@ -224,7 +225,13 @@ isc_create(IscSessionConfig *cfg, IscHandler *fun) ...@@ -224,7 +225,13 @@ isc_create(IscSessionConfig *cfg, IscHandler *fun)
scb->wr_msg_q = NULL; scb->wr_msg_q = NULL;
scb->handlers = NULL; scb->handlers = NULL;
memset(&scb->fun, 0, sizeof(scb->fun)); scb->fun.read = NULL;
scb->fun.write = NULL;
scb->fun.close = NULL;
scb->fun.poll = NULL;
scb->fun.accept = NULL;
scb->fun.destroy = NULL;
scb->fun.parse = NULL;
scb->cfg = cfg; scb->cfg = cfg;
...@@ -277,6 +284,9 @@ isc_destroy(IscMaster *mcb, ...@@ -277,6 +284,9 @@ isc_destroy(IscMaster *mcb,
if (scb->fun.destroy) if (scb->fun.destroy)
ISC_SCALLFUN1(scb, destroy, scb); ISC_SCALLFUN1(scb, destroy, scb);
while (isc_pophandler(scb))
;
if (scb->fd != -1) if (scb->fd != -1)
{ {
close(scb->fd); close(scb->fd);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment