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

Check for NULL values in getinfo_helper_onions

Browse Source 
Fix on 915c7438a7 in Tor 0.2.7.1-alpha.
This commit is contained in:
teor 2015-06-03 03:58:28 +10:00
parent 383a27afc5
commit 6d8a2ff24f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug16115-NULL-getinfo-onions Normal file
View File

@ -0,0 +1,4 @@
o Minor fixes (threads, comments):
- Check for NULL values in getinfo_helper_onions
Patch by "teor".
Fix on 915c7438a77e in Tor 0.2.7.1-alpha.

10
src/or/control.c
View File

@ -2193,7 +2193,7 @@ getinfo_helper_onions(control_connection_t *control_conn,
{
smartlist_t *onion_list = NULL;
if (!strcmp(question, "onions/current")) {
if (control_conn && !strcmp(question, "onions/current")) {
onion_list = control_conn->ephemeral_onion_services;
} else if (!strcmp(question, "onions/detached")) {
onion_list = detached_onion_services;
@ -2201,10 +2201,14 @@ getinfo_helper_onions(control_connection_t *control_conn,
return 0;
}
if (!onion_list || smartlist_len(onion_list) == 0) {
*errmsg = "No onion services of the specified type.";
if (errmsg) {
*errmsg = "No onion services of the specified type.";
}
return -1;
}
*answer = smartlist_join_strings(onion_list, "\r\n", 0, NULL);
if (answer) {
*answer = smartlist_join_strings(onion_list, "\r\n", 0, NULL);
}
return 0;
}