From 868a5757e584431fafe713546c8ef8e799865476 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Fri, 19 Feb 2021 16:57:20 +0100 Subject: [PATCH] BUG/MINOR: server: Be sure to cut the last parsed field of a server-state line If a line of a server-state file has too many fields, the last one is not cut on the first following space, as all other fileds. It contains all the end of the line. It is not the expected behavior. So, now, we cut it on the next following space, if any. The parsing loop was slighly rewritten. Note that for now there is no error reported if the line is too long. This patch may be backported at least as far as 2.1. On 2.0 and prior the code is not the same. The line parsing is inlined in apply_server_state() function. --- src/server.c | 84 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 39 deletions(-) diff --git a/src/server.c b/src/server.c index 21ad438..6be20e2 100644 --- a/src/server.c +++ b/src/server.c @@ -3112,54 +3112,60 @@ static void srv_state_parse_line(char *buf, const int version, char **params, ch /* we're now ready to move the line into *srv_params[] */ memset(params, 0, SRV_STATE_FILE_MAX_FIELDS * sizeof(*params)); memset(srv_params, 0, SRV_STATE_FILE_MAX_FIELDS * sizeof(*srv_params)); - params[0] = cur; - arg = 1; + + arg = 0; srv_arg = 0; while (*cur && arg < SRV_STATE_FILE_MAX_FIELDS) { - if (isspace((unsigned char)*cur)) { - *cur = '\0'; + /* Search begining of the current field */ + while (isspace((unsigned char)*cur)) { ++cur; - while (isspace((unsigned char)*cur)) - ++cur; - - /* v1 - * srv_addr: params[4] => srv_params[0] - * srv_op_state: params[5] => srv_params[1] - * srv_admin_state: params[6] => srv_params[2] - * srv_uweight: params[7] => srv_params[3] - * srv_iweight: params[8] => srv_params[4] - * srv_last_time_change: params[9] => srv_params[5] - * srv_check_status: params[10] => srv_params[6] - * srv_check_result: params[11] => srv_params[7] - * srv_check_health: params[12] => srv_params[8] - * srv_check_state: params[13] => srv_params[9] - * srv_agent_state: params[14] => srv_params[10] - * bk_f_forced_id: params[15] => srv_params[11] - * srv_f_forced_id: params[16] => srv_params[12] - * srv_fqdn: params[17] => srv_params[13] - * srv_port: params[18] => srv_params[14] - * srvrecord: params[19] => srv_params[15] - * v2 - * srv_use_ssl: params[20] => srv_params[16] - * srv_check_port: params[21] => srv_params[17] - * srv_check_addr: params[22] => srv_params[18] - * srv_agent_addr: params[23] => srv_params[19] - * srv_agent_port: params[24] => srv_params[20] - */ - if ((version == 1 && arg >= 4 && arg <= 19) || - (version == 2 && arg >= 4)) { - srv_params[srv_arg] = cur; - ++srv_arg; - } + if (!*cur) + goto end; + } - params[arg] = cur; - ++arg; + /* v1 + * srv_addr: params[4] => srv_params[0] + * srv_op_state: params[5] => srv_params[1] + * srv_admin_state: params[6] => srv_params[2] + * srv_uweight: params[7] => srv_params[3] + * srv_iweight: params[8] => srv_params[4] + * srv_last_time_change: params[9] => srv_params[5] + * srv_check_status: params[10] => srv_params[6] + * srv_check_result: params[11] => srv_params[7] + * srv_check_health: params[12] => srv_params[8] + * srv_check_state: params[13] => srv_params[9] + * srv_agent_state: params[14] => srv_params[10] + * bk_f_forced_id: params[15] => srv_params[11] + * srv_f_forced_id: params[16] => srv_params[12] + * srv_fqdn: params[17] => srv_params[13] + * srv_port: params[18] => srv_params[14] + * srvrecord: params[19] => srv_params[15] + * v2 + * srv_use_ssl: params[20] => srv_params[16] + * srv_check_port: params[21] => srv_params[17] + * srv_check_addr: params[22] => srv_params[18] + * srv_agent_addr: params[23] => srv_params[19] + * srv_agent_port: params[24] => srv_params[20] + */ + if ((version == 1 && arg >= 4 && arg <= 19) || + (version == 2 && arg >= 4)) { + srv_params[srv_arg] = cur; + ++srv_arg; } - else { + params[arg] = cur; + ++arg; + + /* Search end of the current field: first space or \0 */ + /* Search begining of the current field */ + while (!isspace((unsigned char)*cur)) { ++cur; + if (!*cur) + goto end; } + *cur++ = '\0'; } + end: /* if line is incomplete line, then ignore it. * otherwise, update useful flags */ if ((version == 1 && arg < SRV_STATE_FILE_NB_FIELDS_VERSION_1) || -- 1.7.10.4