niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct bool reading from yaml files (#415)

Browse source 
* Replace some wrong strncmp calls with strcmp

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>

* Add quotes checking when detecting bools

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
This commit is contained in:
ivanpauno 2019-04-12 19:25:44 -03:00 • committed by William Woodall
parent d810f12e94
commit 11b5eb865b
1 changed files with 44 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

81
rcl_yaml_param_parser/src/parser.c
View file

@ -118,6 +118,7 @@ static rcl_ret_t replace_ns(
static void * get_value( static void * get_value(
const char * const value, const char * const value,
yaml_scalar_style_t style,
data_types_t * val_type, data_types_t * val_type,
const rcl_allocator_t allocator); const rcl_allocator_t allocator);
@ -709,6 +710,7 @@ static rcl_ret_t add_val_to_string_arr(
/// ///
static void * get_value( static void * get_value(
const char * const value, const char * const value,
yaml_scalar_style_t style,
data_types_t * val_type, data_types_t * val_type,
const rcl_allocator_t allocator) const rcl_allocator_t allocator)
{ {
@ -723,46 +725,50 @@ static void * get_value(
} }
/// Check if it is bool /// Check if it is bool
if ((0 == strncmp(value, "Y", strlen(value))) || if (style != YAML_SINGLE_QUOTED_SCALAR_STYLE &&
(0 == strncmp(value, "y", strlen(value))) || style != YAML_DOUBLE_QUOTED_SCALAR_STYLE)
(0 == strncmp(value, "yes", strlen(value))) ||
(0 == strncmp(value, "Yes", strlen(value))) ||
(0 == strncmp(value, "YES", strlen(value))) ||
(0 == strncmp(value, "true", strlen(value))) ||
(0 == strncmp(value, "True", strlen(value))) ||
(0 == strncmp(value, "TRUE", strlen(value))) ||
(0 == strncmp(value, "on", strlen(value))) ||
(0 == strncmp(value, "On", strlen(value))) ||
(0 == strncmp(value, "ON", strlen(value))))
{ {
*val_type = DATA_TYPE_BOOL; if ((0 == strcmp(value, "Y")) ||
ret_val = allocator.zero_allocate(1U, sizeof(bool), allocator.state); (0 == strcmp(value, "y")) ||
if (NULL == ret_val) { (0 == strcmp(value, "yes")) ||
return NULL; (0 == strcmp(value, "Yes")) ||
(0 == strcmp(value, "YES")) ||
(0 == strcmp(value, "true")) ||
(0 == strcmp(value, "True")) ||
(0 == strcmp(value, "TRUE")) ||
(0 == strcmp(value, "on")) ||
(0 == strcmp(value, "On")) ||
(0 == strcmp(value, "ON")))
{
*val_type = DATA_TYPE_BOOL;
ret_val = allocator.zero_allocate(1U, sizeof(bool), allocator.state);
if (NULL == ret_val) {
return NULL;
}
*((bool *)ret_val) = true;
return ret_val;
} }
*((bool *)ret_val) = true;
return ret_val;
}
if ((0 == strncmp(value, "N", strlen(value))) || if ((0 == strcmp(value, "N")) ||
(0 == strncmp(value, "n", strlen(value))) || (0 == strcmp(value, "n")) ||
(0 == strncmp(value, "no", strlen(value))) || (0 == strcmp(value, "no")) ||
(0 == strncmp(value, "No", strlen(value))) || (0 == strcmp(value, "No")) ||
(0 == strncmp(value, "NO", strlen(value))) || (0 == strcmp(value, "NO")) ||
(0 == strncmp(value, "false", strlen(value))) || (0 == strcmp(value, "false")) ||
(0 == strncmp(value, "False", strlen(value))) || (0 == strcmp(value, "False")) ||
(0 == strncmp(value, "FALSE", strlen(value))) || (0 == strcmp(value, "FALSE")) ||
(0 == strncmp(value, "off", strlen(value))) || (0 == strcmp(value, "off")) ||
(0 == strncmp(value, "Off", strlen(value))) || (0 == strcmp(value, "Off")) ||
(0 == strncmp(value, "OFF", strlen(value)))) (0 == strcmp(value, "OFF")))
{ {
*val_type = DATA_TYPE_BOOL; *val_type = DATA_TYPE_BOOL;
ret_val = allocator.zero_allocate(1U, sizeof(bool), allocator.state); ret_val = allocator.zero_allocate(1U, sizeof(bool), allocator.state);
if (NULL == ret_val) { if (NULL == ret_val) {
return NULL; return NULL;
}
*((bool *)ret_val) = false;
return ret_val;
} }
*((bool *)ret_val) = false;
return ret_val;
} }
/// Check for int /// Check for int
@ -834,6 +840,7 @@ static rcl_ret_t parse_value(
const size_t parameter_idx = ((params_st->params[node_idx].num_params) - 1U); const size_t parameter_idx = ((params_st->params[node_idx].num_params) - 1U);
const size_t val_size = event.data.scalar.length; const size_t val_size = event.data.scalar.length;
const char * value = (char *)event.data.scalar.value; const char * value = (char *)event.data.scalar.value;
yaml_scalar_style_t style = event.data.scalar.style;
const uint32_t line_num = ((uint32_t)(event.start_mark.line) + 1U); const uint32_t line_num = ((uint32_t)(event.start_mark.line) + 1U);
rcl_variant_t * param_value; rcl_variant_t * param_value;
@ -860,7 +867,7 @@ static rcl_ret_t parse_value(
param_value = &(params_st->params[node_idx].parameter_values[parameter_idx]); param_value = &(params_st->params[node_idx].parameter_values[parameter_idx]);
// param_value->string_value = rcutils_strdup(value, allocator); // param_value->string_value = rcutils_strdup(value, allocator);
ret_val = get_value(value, &val_type, allocator); ret_val = get_value(value, style, &val_type, allocator);
if (NULL == ret_val) { if (NULL == ret_val) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Error parsing value %s at line %d", value, line_num); RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Error parsing value %s at line %d", value, line_num);
return RCL_RET_ERROR; return RCL_RET_ERROR;