diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-12 08:12:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-12 08:12:19 -0400 |
| commit | 8294c40c96a9ec59ff3e0a3ce2f4926c275ab114 (patch) | |
| tree | 633a6fa2622ce0babfc9f73f17f1d734402c02bb /src/app | |
| parent | 5a2374b0740ce662e4b323f104c8ff58164d996a (diff) | |
| parent | f8c0f694b7f335358f612b0a26aae8b48110fa50 (diff) | |
| download | tor-8294c40c96a9ec59ff3e0a3ce2f4926c275ab114.tar.gz tor-8294c40c96a9ec59ff3e0a3ce2f4926c275ab114.zip | |
Merge remote-tracking branch 'tor-github/pr/318'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index b3a6e57fa8..1adeb75c98 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -3389,6 +3389,9 @@ options_validate(or_options_t *old_options, or_options_t *options, log_notice(LD_CONFIG, "Your ContactInfo config option is not set. " "Please consider setting it, so we can contact you if your server is " "misconfigured or something else goes wrong."); + const char *ContactInfo = options->ContactInfo; + if (ContactInfo && !string_is_utf8(ContactInfo, strlen(ContactInfo))) + REJECT("ContactInfo config option must be UTF-8."); /* Special case on first boot if no Log options are given. */ if (!options->Logs && !options->RunAsDaemon && !from_setconf) { |