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

Fix crash when read_file_to_string() fails in SAVECONF

Browse Source 
The new behavior is to try to rename the old file if there is one there
that we can't read.  In all likelihood, that will fail too, but at least
we tried, and at least it won't crash.
This commit is contained in:
Nick Mathewson 2011-05-11 22:05:41 -04:00
parent e7b10e5ecf
commit 13847b8db6
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

@ -4625,7 +4625,7 @@ write_configuration_file(const char *fname, or_options_t *options)
switch (file_status(fname)) { switch (file_status(fname)) {
case FN_FILE: case FN_FILE:
old_val = read_file_to_str(fname, 0, NULL); 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; rename_old = 1;
} }
tor_free(old_val); tor_free(old_val);