torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

In routerlist_assert_ok(), check r2 before taking &(r2->cache_info)

Browse Source 
Technically, we're not allowed to take the address of a member can't
exist relative to the null pointer.  That makes me wonder how any sane
compliant system implements the offsetof macro, but let's let sleeping
balrogs lie.

Fixes 13096; patch on 0.1.1.9-alpha; patch from "teor", who was using
clang -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv
This commit is contained in:
Nick Mathewson
2014-09-10 23:46:20 -04:00
parent a9b2e5eac6
commit 3c2c6a6116
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug13096
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes (conformance):
- In routerlist_assert_ok(), don't take the address of a routerinfo's
cache_info member unless that routerinfo is non-NULL. Fixes bug
13096; bugfix on 0.1.1.9-alpha. Patch by "teor".
src/or/routerlist.c
+1 -1
View File
@@ -4938,7 +4938,7 @@ routerlist_assert_ok(const routerlist_t *rl)
} SMARTLIST_FOREACH_END(r);
SMARTLIST_FOREACH_BEGIN(rl->old_routers, signed_descriptor_t *, sd) {
r2 = rimap_get(rl->identity_map, sd->identity_digest);
tor_assert(sd != &(r2->cache_info));
tor_assert(!r2 || sd != &(r2->cache_info));
sd2 = sdmap_get(rl->desc_digest_map, sd->signed_descriptor_digest);
tor_assert(sd == sd2);
tor_assert(sd->routerlist_index == sd_sl_idx);