nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

HT_NEXT invalidates the last iterator; fix rmv-related segfault.

Browse Source 
svn:r5458
This commit is contained in:
Nick Mathewson 2005-11-26 00:42:25 +00:00
parent fe221f3dff
commit 72cb64406a
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/common/container.c
View File

@ -756,26 +756,28 @@ digestmap_iter_next(digestmap_t *map, digestmap_iter_t *iter)
strmap_iter_t * strmap_iter_t *
strmap_iter_next_rmv(strmap_t *map, strmap_iter_t *iter) strmap_iter_next_rmv(strmap_t *map, strmap_iter_t *iter)
{ {
strmap_iter_t *next; strmap_entry_t *rmv;
tor_assert(map); tor_assert(map);
tor_assert(iter); tor_assert(iter);
next = HT_NEXT_RMV(strmap_tree, &map->head, iter); tor_assert(*iter);
if (*iter) { rmv = *iter;
tor_free((*iter)->key); iter = HT_NEXT_RMV(strmap_tree, &map->head, iter);
tor_free(*iter); tor_free(rmv->key);
} tor_free(rmv);
return next; return iter;
} }
digestmap_iter_t * digestmap_iter_t *
digestmap_iter_next_rmv(digestmap_t *map, digestmap_iter_t *iter) digestmap_iter_next_rmv(digestmap_t *map, digestmap_iter_t *iter)
{ {
digestmap_iter_t *next; digestmap_entry_t *rmv;
tor_assert(map); tor_assert(map);
tor_assert(iter); tor_assert(iter);
next = HT_NEXT_RMV(digestmap_tree, &map->head, iter); tor_assert(*iter);
tor_free(*iter); rmv = *iter;
return next; iter = HT_NEXT_RMV(digestmap_tree, &map->head, iter);
tor_free(rmv);
return iter;
} }
/** Set *keyp and *valp to the current entry pointed to by iter. /** Set *keyp and *valp to the current entry pointed to by iter.
@ -784,6 +786,7 @@ void
strmap_iter_get(strmap_iter_t *iter, const char **keyp, void **valp) strmap_iter_get(strmap_iter_t *iter, const char **keyp, void **valp)
{ {
tor_assert(iter); tor_assert(iter);
tor_assert(*iter);
tor_assert(keyp); tor_assert(keyp);
tor_assert(valp); tor_assert(valp);
*keyp = (*iter)->key; *keyp = (*iter)->key;
@ -794,6 +797,7 @@ void
digestmap_iter_get(digestmap_iter_t *iter, const char **keyp, void **valp) digestmap_iter_get(digestmap_iter_t *iter, const char **keyp, void **valp)
{ {
tor_assert(iter); tor_assert(iter);
tor_assert(*iter);
tor_assert(keyp); tor_assert(keyp);
tor_assert(valp); tor_assert(valp);
*keyp = (*iter)->key; *keyp = (*iter)->key;

1
src/common/ht.h
View File

@ -262,7 +262,6 @@ ht_string_hash(const char *s)
} \ } \
} }
#if 0 #if 0
/* Helpers for an iterator type that saves some mod operations at the expense /* Helpers for an iterator type that saves some mod operations at the expense
* of many branches. Not worth it, it seems. */ * of many branches. Not worth it, it seems. */