Don't crash if we get an unexpected value for the

PublishServerDescriptor config option. Reported by Matt Edman;
bugfix on 0.2.0.9-alpha.


svn:r12549
This commit is contained in:
Roger Dingledine 2007-11-22 00:43:22 +00:00
parent 094096d320
commit a54ce34e35
2 changed files with 5 additions and 3 deletions

View File

@ -3,6 +3,9 @@ Changes in version 0.2.0.13-alpha - 2007-11-??
- The fix in 0.2.0.12-alpha cleared the "hsdir" flag in v3 network
consensus documents when there are too many relays at a single
IP address. Now clear it in v2 network status documents too.
- Don't crash if we get an unexpected value for the
PublishServerDescriptor config option. Reported by Matt Edman;
bugfix on 0.2.0.9-alpha.
Changes in version 0.2.0.12-alpha - 2007-11-16

View File

@ -2821,11 +2821,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
});
}
if ((i = parse_authority_type_from_list(options->PublishServerDescriptor,
if ((parse_authority_type_from_list(options->PublishServerDescriptor,
&options->_PublishServerDescriptor, 1) < 0)) {
r = tor_snprintf(buf, sizeof(buf),
"Unrecognized value '%s' for PublishServerDescriptor",
(char*)smartlist_get(options->PublishServerDescriptor, -i));
"Unrecognized value for PublishServerDescriptor");
*msg = tor_strdup(r >= 0 ? buf : "internal error");
return -1;
}