diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2009-09-28 16:37:01 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2009-12-12 03:29:44 +0100 |
| commit | 3807db001d71c51e53c1897ae067671f5b771f2f (patch) | |
| tree | 6c6f648f072d24e7bbf554de12519b27cd9ef888 /src/or/circuitbuild.c | |
| parent | 4afdb79051f7b1caba49877fb57be60bda9d4514 (diff) | |
| download | tor-3807db001d71c51e53c1897ae067671f5b771f2f.tar tor-3807db001d71c51e53c1897ae067671f5b771f2f.tar.gz | |
*_free functions now accept NULL
Some *_free functions threw asserts when passed NULL. Now all of them
accept NULL as input and perform no action when called that way.
This gains us consistence for our free functions, and allows some
code simplifications where an explicit null check is no longer necessary.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 91fa9d8db..29f9d7732 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2744,7 +2744,8 @@ extend_info_from_router(routerinfo_t *r) void extend_info_free(extend_info_t *info) { - tor_assert(info); + if (!info) + return; if (info->onion_key) crypto_free_pk_env(info->onion_key); tor_free(info); @@ -3053,7 +3054,8 @@ pick_entry_guards(void) static void entry_guard_free(entry_guard_t *e) { - tor_assert(e); + if (!e) + return; tor_free(e->chosen_by_version); tor_free(e); } |