From 70498a7cce831049b47051813b850665c5547927 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Fri, 27 Oct 2017 16:06:39 +0200 Subject: Improve a bit the coverage wrt. broken configurations --- src/sp_config_utils.c | 4 ++-- src/tests/broken_conf_truncated.phpt | 9 +++++++++ src/tests/config/config_broken_conf_truncated.ini | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 src/tests/broken_conf_truncated.phpt create mode 100644 src/tests/config/config_broken_conf_truncated.ini (limited to 'src') diff --git a/src/sp_config_utils.c b/src/sp_config_utils.c index 62fb7c1..12df098 100644 --- a/src/sp_config_utils.c +++ b/src/sp_config_utils.c @@ -60,7 +60,7 @@ static char *get_string(size_t *consumed, char *restrict line, size_t j = 0; char *ret = NULL; - if (NULL == line) { + if (NULL == line || '\0' == *line) { goto err; } @@ -189,4 +189,4 @@ zend_always_inline sp_node_t *parse_functions_list(char *value) { free(tmp); return list; -} \ No newline at end of file +} diff --git a/src/tests/broken_conf_truncated.phpt b/src/tests/broken_conf_truncated.phpt new file mode 100644 index 0000000..74f3524 --- /dev/null +++ b/src/tests/broken_conf_truncated.phpt @@ -0,0 +1,9 @@ +--TEST-- +Bad boolean value in configuration +--SKIPIF-- + +--INI-- +sp.configuration_file={PWD}/config/config_broken_conf_truncated.ini +--FILE-- +--EXPECT-- +[snuffleupagus][0.0.0.0][error][error] A valid string as parameter is expected on line 1. diff --git a/src/tests/config/config_broken_conf_truncated.ini b/src/tests/config/config_broken_conf_truncated.ini new file mode 100644 index 0000000..bf05dfb --- /dev/null +++ b/src/tests/config/config_broken_conf_truncated.ini @@ -0,0 +1 @@ +sp.disable_function.function("").param(no quote, omg! -- cgit v1.3