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.1' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2011-05-11 22:52:26 -04:00
commit 8057b7363e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug3135 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes
- Do not crash when our configuration file becomes unreadable
(usually due to a permissions change) between when we start
up and when a controller calls SAVECONF. Fixes bug 3135;
bugfix on 0.0.9pre6.

2
src/or/config.c
View File

@ -4646,7 +4646,7 @@ write_configuration_file(const char *fname, or_options_t *options)
switch (file_status(fname)) {
case FN_FILE:
old_val = read_file_to_str(fname, 0, NULL);
if (strcmpstart(old_val, GENERATED_FILE_PREFIX)) {
if (!old_val || strcmpstart(old_val, GENERATED_FILE_PREFIX)) {
rename_old = 1;
}
tor_free(old_val);