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

Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source
This commit is contained in:
Nick Mathewson 2012-09-05 16:25:13 -04:00
commit f8c1ab7bbf
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug6774 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Avoid crashing on a malformed state file where EntryGuardPathBias
precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta.

6
src/or/circuitbuild.c
View File

@ -4904,6 +4904,12 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
const or_options_t *options = get_options();
unsigned hop_cnt, success_cnt;
if (!node) {
*msg = tor_strdup("Unable to parse entry nodes: "
"EntryGuardPathBias without EntryGuard");
break;
}
if (tor_sscanf(line->value, "%u %u", &success_cnt, &hop_cnt) != 2) {
log_warn(LD_GENERAL, "Unable to parse guard path bias info: "
"Misformated EntryGuardPathBias %s", escaped(line->value));