sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid segfault when accessing hidden service.

This commit is contained in:
Karsten Loesing 2009-08-29 19:41:08 +02:00
parent 64f393d56f
commit dd8f16beb5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23,6 +23,9 @@ Changes in version 0.2.1.20 - 2009-??-??
a wrong clock. Instead, we should only inform the controller when
it's a trusted authority that claims our clock is wrong. Bugfix
on 0.2.0.20-rc; starts to fix bug 1074. Reported by SwissTorExit.
- Avoid segfault in rare cases when finishing an introduction circuit
as a client and finding out that we don't have an introduction key
for it. Fixes bug 1073. Reported by Aaron Swartz.
Changes in version 0.2.1.19 - 2009-07-28

3
src/or/rendclient.c
View File

@ -94,6 +94,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
}
});
if (!intro_key) {
int num_intro_points = smartlist_len(entry->parsed->intro_nodes);
if (rend_cache_lookup_entry(introcirc->rend_data->onion_address,
0, &entry) > 0) {
log_warn(LD_BUG, "We have both a v0 and a v2 rend desc for this "
@ -109,7 +110,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
} else {
log_warn(LD_BUG, "Internal error: could not find intro key; we "
"only have a v2 rend desc with %d intro points.",
smartlist_len(entry->parsed->intro_nodes));
num_intro_points);
goto err;
}
}