diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-10 10:19:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-10 10:19:57 -0400 |
| commit | 0ab7716b9ec0deebfa3124ffc2c7a7f0b0d705e6 (patch) | |
| tree | f993dc07e6a961185c587a077c0718c1a8f3d88b | |
| parent | 344bb1d64c539ca66cd377350065e9486397d1eb (diff) | |
| parent | 93ee62297ff24fcd01f97c87d76953f4d5fb377c (diff) | |
| download | tor-0ab7716b9ec0deebfa3124ffc2c7a7f0b0d705e6.tar.gz tor-0ab7716b9ec0deebfa3124ffc2c7a7f0b0d705e6.zip | |
Merge remote-tracking branch 'linus/bug6797'
| -rw-r--r-- | changes/bug6797 | 3 | ||||
| -rw-r--r-- | src/or/dirserv.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug6797 b/changes/bug6797 new file mode 100644 index 0000000000..f52f899ef0 --- /dev/null +++ b/changes/bug6797 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't follow the NULL pointer. Found by "f. tp.". Fixes bug + 6797; bugfix on 0.2.4.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 7f4690678e..e7a2623575 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2800,9 +2800,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, h->microdesc_hash_line = tor_strdup(buf); h->next = vrs->microdesc; vrs->microdesc = h; + md->last_listed = now; + smartlist_add(microdescriptors, md); } - md->last_listed = now; - smartlist_add(microdescriptors, md); } smartlist_add(routerstatuses, vrs); |