diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-03-12 12:12:35 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-03-12 12:12:35 -0500 |
commit | 4ab2a89dc73202f90a266979fadbb154df7dcd65 (patch) | |
tree | a3b20c09a7eb1cc6d5f13f381db4b7c690c43475 /evrpc.c | |
parent | f28084ddda02886a97943e36099c4a523f72af0b (diff) | |
parent | 4b8f02f14751c6c2d53cad3597a711a1a008e07f (diff) | |
download | libevent-4ab2a89dc73202f90a266979fadbb154df7dcd65.tar.gz |
Merge remote branch 'origin/patches-2.0'
Diffstat (limited to 'evrpc.c')
-rw-r--r-- | evrpc.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -99,7 +99,7 @@ evrpc_free(struct evrpc_base *base) while ((rpc = TAILQ_FIRST(&base->registered_rpcs)) != NULL) { r = evrpc_unregister_rpc(base, rpc->uri); - EVUTIL_ASSERT(r); + EVUTIL_ASSERT(r == 0); } while ((pause = TAILQ_FIRST(&base->paused_requests)) != NULL) { TAILQ_REMOVE(&base->paused_requests, pause, next); @@ -264,9 +264,6 @@ evrpc_unregister_rpc(struct evrpc_base *base, const char *name) } TAILQ_REMOVE(&base->registered_rpcs, rpc, next); - mm_free((char *)rpc->uri); - mm_free(rpc); - registered_uri = evrpc_construct_uri(name); /* remove the http server callback */ @@ -274,6 +271,9 @@ evrpc_unregister_rpc(struct evrpc_base *base, const char *name) EVUTIL_ASSERT(r == 0); mm_free(registered_uri); + + mm_free((char *)rpc->uri); + mm_free(rpc); return (0); } |