diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2009-06-16 22:07:16 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-06-16 16:46:01 -0400 |
| commit | da347295323ec288da4da91d5a925e2fd19d09bc (patch) | |
| tree | 63121dc9908ddf04f31d860b08bb906da9ea6873 /src/or/rendcommon.c | |
| parent | 632579f5927dd319e6841b30be88d4388d9041eb (diff) | |
| download | tor-da347295323ec288da4da91d5a925e2fd19d09bc.tar.gz tor-da347295323ec288da4da91d5a925e2fd19d09bc.zip | |
Backport fix for bug 997.
Backporting 6a32beb and ca8708a.
Diffstat (limited to 'src/or/rendcommon.c')
| -rw-r--r-- | src/or/rendcommon.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 28d422343a..d2d5eb3779 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -783,6 +783,11 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) } if (!*e) return 0; + tor_assert((*e)->parsed && (*e)->parsed->intro_nodes); + /* XXX022 hack for now, to return "not found" if there are no intro + * points remaining. See bug 997. */ + if (smartlist_len((*e)->parsed->intro_nodes) == 0) + return 0; return 1; } |