diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-27 18:23:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-27 18:23:53 -0400 |
| commit | 5acfc3087663340f55de6081cdd13b484525f43a (patch) | |
| tree | 633eb49a5791e24aa2dcb553e6306f964f777c38 | |
| parent | 068d092749508bae84e6d5fce605d2f40c1bdb80 (diff) | |
| parent | 4bb7d9fd1241a3c263636efa03ee8c62ab744515 (diff) | |
| download | tor-5acfc3087663340f55de6081cdd13b484525f43a.tar.gz tor-5acfc3087663340f55de6081cdd13b484525f43a.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.1
| -rw-r--r-- | changes/bug25629 | 3 | ||||
| -rw-r--r-- | src/or/nodelist.c | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/changes/bug25629 b/changes/bug25629 new file mode 100644 index 0000000000..190928a941 --- /dev/null +++ b/changes/bug25629 @@ -0,0 +1,3 @@ + o Minor bugfixes (C correctness): + - Fix a very unlikely null pointer dereference. Fixes bug 25629; + bugfix on 0.2.9.15. Found by Coverity; this is CID 1430932. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index c754ebdb6e..aaec39f7b8 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -291,13 +291,12 @@ nodelist_add_microdesc(microdesc_t *md) if (rs == NULL) return NULL; node = node_get_mutable_by_id(rs->identity_digest); - if (node) { - if (node->md) - node->md->held_by_nodes--; - node->md = md; - md->held_by_nodes++; - } - + if (node == NULL) + return NULL; + if (node->md) + node->md->held_by_nodes--; + node->md = md; + md->held_by_nodes++; node_add_to_address_set(node); return node; |