nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't double-free successful_uploads.

Browse Source 
When we used smartlist_free to free the list of succesful uploads
because we had succeeded in uploading everywhere, we did not actually
set the successful_uploads field to NULL, so later it would get freed
again in rend_service_descriptor_free.  Fix for bug 948; bug
introduced in 0.2.1.6-alpha.

svn:r19073
This commit is contained in:
Nick Mathewson 2009-03-18 14:35:24 +00:00
parent ad7ebec24c
commit 30ec1d1d50
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -10,6 +10,8 @@ Changes in version 0.2.1.14-??? - 2009-03-??
- When starting with a cache over a few days old, do not leak - When starting with a cache over a few days old, do not leak
memory for the obsolete router descriptors in it. Bugfix on memory for the obsolete router descriptors in it. Bugfix on
0.2.0.33. 0.2.0.33.
- Avoid double-free on list of successfully uploaded hidden
service discriptors. Fix for bug 948. Bugfix on 0.2.1.6-alpha.
Changes in version 0.2.1.13-alpha - 2009-03-09 Changes in version 0.2.1.13-alpha - 2009-03-09

6
src/or/rendservice.c
View File

@ -1676,6 +1676,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
if (renddesc->successful_uploads) { if (renddesc->successful_uploads) {
SMARTLIST_FOREACH(renddesc->successful_uploads, char *, c, tor_free(c);); SMARTLIST_FOREACH(renddesc->successful_uploads, char *, c, tor_free(c););
smartlist_free(renddesc->successful_uploads); smartlist_free(renddesc->successful_uploads);
renddesc->successful_uploads = NULL;
} }
renddesc->all_uploads_performed = 1; renddesc->all_uploads_performed = 1;
} else { } else {
@ -1683,10 +1684,9 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
* descriptor to them again. */ * descriptor to them again. */
if (!renddesc->successful_uploads) if (!renddesc->successful_uploads)
renddesc->successful_uploads = smartlist_create(); renddesc->successful_uploads = smartlist_create();
SMARTLIST_FOREACH(successful_uploads, char *, c, { SMARTLIST_FOREACH(successful_uploads, const char *, c, {
if (!smartlist_digest_isin(renddesc->successful_uploads, c)) { if (!smartlist_digest_isin(renddesc->successful_uploads, c)) {
char *hsdir_id = tor_malloc_zero(DIGEST_LEN); char *hsdir_id = tor_memdup(c, DIGEST_LEN);
memcpy(hsdir_id, c, DIGEST_LEN);
smartlist_add(renddesc->successful_uploads, hsdir_id); smartlist_add(renddesc->successful_uploads, hsdir_id);
} }
}); });