nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +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-07-16 11:50:53 -04:00
commit 7ac8a4a037
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug6397 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes:
- When disabling guards for having too high a proportion of failed
circuits, make sure to look at each guard. Fix for bug 6397; bugfix
on 0.2.3.17-beta.

4
changes/cov709056 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Check return value of fputs() when writing authority certificate
file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha.

10
src/or/circuitbuild.c
View File

@ -4728,8 +4728,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
} }
} }
SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e, SMARTLIST_FOREACH_BEGIN(new_entry_guards, entry_guard_t *, e) {
{
char *sp; char *sp;
char *val = digestmap_get(added_by, e->identity); char *val = digestmap_get(added_by, e->identity);
if (val && (sp = strchr(val, ' '))) { if (val && (sp = strchr(val, ' '))) {
@ -4747,9 +4746,10 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
e->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30); e->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30);
} }
} }
if (node->path_bias_disabled && !node->bad_since) if (e->path_bias_disabled && !e->bad_since)
node->bad_since = time(NULL); e->bad_since = time(NULL);
}); }
SMARTLIST_FOREACH_END(e);
if (*msg || !set) { if (*msg || !set) {
SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e, SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e,

7
src/tools/tor-gencert.c
View File

@ -497,7 +497,12 @@ generate_certificate(void)
return 1; return 1;
} }
fputs(buf, f); if (fputs(buf, f) < 0) {
log_err(LD_GENERAL, "Couldn't write to %s: %s",
certificate_file, strerror(errno));
fclose(f);
return 1;
}
fclose(f); fclose(f);
return 0; return 0;
} }