mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-28 06:13:31 +01:00
Fix crash when read_file_to_string() fails in SAVECONF
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:
parent
e7b10e5ecf
commit
13847b8db6
6
changes/bug3135
Normal file
6
changes/bug3135
Normal 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.
|
||||||
|
|
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user