Don't follow the NULL pointer.

If dirvote_create_microdescriptor() returns NULL, don't use md.

Found by "f. tp.".

Fixes bug 6797.

diff --git a/changes/bug6797 b/changes/bug6797
new file mode 100644 (file)
index 0000000..f52f899
--- /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 7f4690678e648740cf6d5593f1237bea495a203a..e7a2623575c51cd639eda197ee2872571f8ef871 100644 (file)
--- 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);