nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Be more defensive in get_transport_bindaddr().

Browse Source 
Make sure that lines in get_transport_bindaddr() begin with the name
of the transport and a space.
This commit is contained in:
George Kadianakis 2011-09-11 21:33:02 +02:00
parent ebc232bb79
commit 9a42ec6857
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/or/config.c
View File

@ -5823,12 +5823,26 @@ get_transport_in_state_by_name(const char *transport)
const char * const char *
get_transport_bindaddr(const char *line, const char *transport) get_transport_bindaddr(const char *line, const char *transport)
{ {
if (strlen(line) < strlen(transport) + 2) char *line_tmp = NULL;
return NULL;
else if (strlen(line) < strlen(transport) + 2) {
goto broken_state;
} else {
/* line should start with the name of the transport and a space.
(for example, "obfs2 127.0.0.1:47245") */
tor_asprintf(&line_tmp, "%s ", transport);
if (strcmpstart(line, line_tmp))
goto broken_state;
tor_free(line_tmp);
return (line+strlen(transport)+1); return (line+strlen(transport)+1);
} }
broken_state:
tor_free(line_tmp);
return NULL;
}
/** Return a static string containing the address:port a proxy /** Return a static string containing the address:port a proxy
* transport should bind on. */ * transport should bind on. */
const char * const char *