nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-12 22:23:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.0

Browse Source
This commit is contained in:
Roger Dingledine 2017-05-25 00:27:27 -04:00
commit 83439e78cc
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug22370 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (memory handling):
- When directory authorities reject a router descriptor due to keypinning,
free the router descriptor rather than leaking the memory.
Fixes bug 22370; bugfix on 0.2.7.2-alpha.

7
src/or/dirserv.c
View File

@ -626,7 +626,11 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose,
* passed back to the origin of this descriptor, or NULL if there is no such * passed back to the origin of this descriptor, or NULL if there is no such
* message. Use <b>source</b> to produce better log messages. * message. Use <b>source</b> to produce better log messages.
* *
* Return the status of the operation * If <b>ri</b> is not added to the list of server descriptors, free it.
* That means the caller must not access <b>ri</b> after this function
* returns, since it might have been freed.
*
* Return the status of the operation.
* *
* This function is only called when fresh descriptors are posted, not when * This function is only called when fresh descriptors are posted, not when
* we re-load the cache. * we re-load the cache.
@ -699,6 +703,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source)
"its key did not match an older RSA/Ed25519 keypair", "its key did not match an older RSA/Ed25519 keypair",
router_describe(ri), source); router_describe(ri), source);
*msg = "Looks like your keypair does not match its older value."; *msg = "Looks like your keypair does not match its older value.";
routerinfo_free(ri);
return ROUTER_AUTHDIR_REJECTS; return ROUTER_AUTHDIR_REJECTS;
} }