XQF
/
xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stat: filter http server list and fix a crash 

- filter http server list for bad character
- fix a crash related to string allocation
master
Thomas Debesse 2019-02-17 02:12:55 +01:00
parent 4db61dc1a1
commit 18225ff8e1
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/stat.c
View File

@ -144,23 +144,35 @@ static int parse_master_output (char *str, struct stat_conn *conn) {
debug (6, "parse_master_output(%s,%p)",str,conn);
n = tokenize_bychar (str, token, 8, QSTAT_DELIM);
// HACK: UGLY HACK UGLY HACK UGLY HACK UGLY HACK
// output from UT 2003 http server is formatted as
// ip port gamespy_port
// not the standard ip:port
// If the master type is http and there are three columns
// then it merges ip and port into one so it is handled
// like other http master servers.
// This is done by modifying token[0] which points somewhere
// inside str so malloc/free is not necessary. It is guaranteed
// that token[0] has enough space as there is at least a
// whitespace character where the colon is placed now.
if (conn->master->type == UT2_SERVER && conn->master->master_type == MASTER_HTTP && n == 3) {
int off = strlen(token[0]);
token[0][off]=':';
strcpy(token[0]+off+1,token[1]);
if (conn->master->master_type == MASTER_HTTP) {
// HACK: UGLY HACK UGLY HACK UGLY HACK UGLY HACK
// output from UT 2003 http server is formatted as
// ip port gamespy_port
// not the standard ip:port
// If the master type is http and there are three columns
// then it merges ip and port into one so it is handled
// like other http master servers.
// This is done by modifying token[0] which points somewhere
// inside str so malloc/free is not necessary. It is guaranteed
// that token[0] has enough space as there is at least a
// whitespace character where the colon is placed now.
if (conn->master->type == UT2_SERVER && n == 3) {
int off = strlen(token[0]);
token[0][off]=':';
strcpy(token[0]+off+1,token[1]);
n=1;
n=1;
}
// HACK: UGLY HACK UGLY HACK UGLY HACK UGLY HACK
// gameaholic has '#' comments
// hambloch.com has '::' comments and empty lines
// hostname always starts with a letter or a number
// ignore everything else
if ( (token[0][0] < '0' || token[0][0] > '9') &&
(token[0][0] < 'a' || token[0][0] > 'z') ) {
return TRUE;
}
}
// output from broadcast, last line contains
@ -293,7 +305,7 @@ static int parse_master_output (char *str, struct stat_conn *conn) {
else { /* hostname */
tmp = g_ascii_strdown (addr, -1); /* g_ascii_strdown does not modify string in place */
addr = tmp;
strcpy(addr, tmp);
g_free(tmp);
port += conn->master->options.portadjust;