torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

control/getinfo: Use standard error handling

Browse Source 
Use BUG() for coding errors, and `< 0` for error checks.

Fix to 31684.
This commit is contained in:
teor
2019-10-21 13:49:44 +10:00
parent 3b2525c375
commit 92fa5239fc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/feature/control/control_getinfo.c
+4 -5
View File
@@ -333,9 +333,8 @@ getinfo_helper_current_consensus(consensus_flavor_t flavor,
const char** errmsg)
{
const char *flavor_name = networkstatus_get_flavor_name(flavor);
if (!strcmp(flavor_name, "??")) {
*errmsg = "Could not open cached consensus. "
"Make sure FetchUselessDescriptors is set to 1.";
if (BUG(!strcmp(flavor_name, "??"))) {
*errmsg = "Internal error: unrecognized flavor name.";
return -1;
}
if (we_want_to_fetch_flavor(get_options(), flavor)) {
@@ -615,14 +614,14 @@ getinfo_helper_dir(control_connection_t *control_conn,
} else if (!strcmp(question, "dir/status-vote/current/consensus")) {
int consensus_result = getinfo_helper_current_consensus(FLAV_NS,
answer, errmsg);
if (consensus_result == -1) {
if (consensus_result < 0) {
return -1;
}
} else if (!strcmp(question,
"dir/status-vote/current/consensus-microdesc")) {
int consensus_result = getinfo_helper_current_consensus(FLAV_MICRODESC,
answer, errmsg);
if (consensus_result == -1) {
if (consensus_result < 0) {
return -1;
}
} else if (!strcmp(question, "network-status")) { /* v1 */