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 branch 'maint-0.3.1'

Browse Source
This commit is contained in:
Nick Mathewson 2017-06-29 10:43:50 -04:00
commit 2c718c1a12
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/diagnose_22752 Normal file
View File

@ -0,0 +1,4 @@
o Minor features (bug mitigation, diagnostics, logging):
- Avoid an assertion failure, and log a better error message,
when unable to remove a file from the consensus cache on
Windows. Attempts to mitigate and diagnose bug 22752.

6
src/common/storagedir.c
View File

@ -119,7 +119,8 @@ storage_dir_clean_tmpfiles(storage_dir_t *d)
char *path = NULL;
tor_asprintf(&path, "%s/%s", d->directory, fname);
if (unlink(sandbox_intern_string(path))) {
log_warn(LD_FS, "Unable to unlink %s", escaped(path));
log_warn(LD_FS, "Unable to unlink %s while cleaning "
"temporary files: %s", escaped(path), strerror(errno));
tor_free(path);
continue;
}
@ -455,7 +456,8 @@ storage_dir_remove_file(storage_dir_t *d,
if (unlink(ipath) == 0) {
storage_dir_reduce_usage(d, size);
} else {
log_warn(LD_FS, "Unable to unlink %s", escaped(path));
log_warn(LD_FS, "Unable to unlink %s while removing file: %s",
escaped(path), strerror(errno));
tor_free(path);
return;
}

6
src/or/consdiffmgr.c
View File

@ -325,7 +325,8 @@ cdm_diff_ht_purge(consensus_flavor_t flav,
if ((*diff)->cdm_diff_status == CDM_DIFF_PRESENT &&
flav == (*diff)->flavor) {
if (consensus_cache_entry_handle_get((*diff)->entry) == NULL) {
if (BUG((*diff)->entry == NULL) ||
consensus_cache_entry_handle_get((*diff)->entry) == NULL) {
/* the underlying entry has gone away; drop this. */
next = HT_NEXT_RMV(cdm_diff_ht, &cdm_diff_ht, diff);
cdm_diff_free(this);
@ -622,6 +623,9 @@ consdiffmgr_find_diff_from(consensus_cache_entry_t **entry_out,
return CONSDIFF_IN_PROGRESS;
}
if (BUG(ent->entry == NULL)) {
return CONSDIFF_NOT_FOUND;
}
*entry_out = consensus_cache_entry_handle_get(ent->entry);
return (*entry_out) ? CONSDIFF_AVAILABLE : CONSDIFF_NOT_FOUND;