Bugfixes + more tests for logger

src/logger.c

@@ -353,12 +353,14 @@ int pyfcgi_logger_parse_field_dtfmt(const char** ptr, char** format)
 int pyfcgi_logger_parse_field_sz(const char **ptr, size_t *size)
 {
 	char *end;
+	*size = 0;
 	if(**ptr == '}' || **ptr == ':')
 	{
 		(*ptr)++;
-		return (*size = 0);
+		return 0;
 	}
-	if(**ptr < '0' && **ptr > 9)
+
+	if(**ptr < '0' || **ptr > '9')
 	{
 		return 1; // parse error
 	}

tests/check_logger.c

@@ -6,6 +6,9 @@
 
 pyfcgi_conf_logger_t *conf = &PyFCGI_conf.logs;
 
+/*
+	TC logger init
+*/
 START_TEST(test_logger_init)
 {
 
@@ -35,6 +38,10 @@ START_TEST(test_logger_format_add)
 END_TEST
 */
 
+/*
+	TC logger default values
+*/
+
 START_TEST(test_logger_parse_field_dtfmt_default)
 {
 	int ret;
@@ -65,6 +72,7 @@ START_TEST(test_logger_parse_field_sz_default)
 		ptr = *orig;
 
 		ret = pyfcgi_logger_parse_field_sz((const char**)&ptr, &val);
+		ck_assert_int_eq(ret, 0);
 		ck_assert_int_eq(val, 0);
 		ck_assert_ptr_eq(ptr, (*orig)+1);
 		orig++;
@@ -106,6 +114,10 @@ START_TEST(test_logger_parse_field_datetime_default)
 }
 END_TEST
 
+/*
+	TC logger field parsing
+*/
+
 START_TEST(test_logger_parse_field_sz)
 {
 	int ret, *res;
@@ -353,10 +365,63 @@ START_TEST(test_logger_parse_field_msg)
 }
 END_TEST
 
+/*
+	TC logger format parsing error
+*/
+START_TEST(test_logger_parse_field_sz_err)
+{
+	int ret, *res;
+	size_t val;
+	char **ptr, **orig;
+	char *vals[] = {"-42:%F}", "abc:}", "", "", NULL};
+
+	orig = vals;
+	while(*orig)
+	{
+		ptr = orig;
+
+		ret = pyfcgi_logger_parse_field_sz((const char**)ptr, &val);
+		ck_assert_int_eq(val, 0);
+		ck_assert_int_ne(ret, 0);
+		orig++;
+		res++;
+	}
+}
+END_TEST
+
+START_TEST(test_logger_parse_field_parse_err)
+{
+	int ret;
+	char **val, **ptr;
+	char err[PYFCGI_LOGGER_FMT_PARSE_ERRSZ];
+	char *vals[] = {"foobar}", "::}", "ident", "",
+	                "level", "pid", "42}", ":ident:", ":ident}", NULL};
+	pyfcgi_logger_fmt_field_t field;
+
+	val = vals;
+	memset(&field, 0, sizeof(pyfcgi_logger_fmt_field_t));
+	while(*val)
+	{
+		ptr = val;
+		*err = '\0';
+
+		ret = pyfcgi_logger_parse_field((const char**)ptr,
+		                                (const char*)*ptr, &field,
+						err);
+		ck_assert_int_ne(ret, 0);
+		ck_assert_int_ne(*err, '\0');
+		ck_assert_int_eq(field.type, pyfcgi_logger_field_null);
+		val++;
+	}
+}
+END_TEST
+
+/* Suite, runner & main */
+
 Suite * logger_suite(void)
 {
 	Suite *s;
-	TCase *tc_init, *tc_fmt, *tc_fmt_default;
+	TCase *tc_init, *tc_field, *tc_field_default, *tc_parse_err;
 
 	s = suite_create("Logger");
 
@@ -365,21 +430,27 @@ Suite * logger_suite(void)
 	//tcase_add_test(tc_init, test_logger_format_add);
 	suite_add_tcase(s, tc_init);
 
-	tc_fmt_default = tcase_create("Logger format parsing default values");
-	tcase_add_test(tc_fmt_default, test_logger_parse_field_dtfmt_default);
-	tcase_add_test(tc_fmt_default, test_logger_parse_field_sz_default);
-	tcase_add_test(tc_fmt_default, test_logger_parse_field_datetime_default);
-	suite_add_tcase(s, tc_fmt_default);
-
-	tc_fmt = tcase_create("Logger format parsing");
-	tcase_add_test(tc_fmt, test_logger_parse_field_sz);
-	tcase_add_test(tc_fmt, test_logger_parse_field_datetime);
-	tcase_add_test(tc_fmt, test_logger_parse_field_level);
-	tcase_add_test(tc_fmt, test_logger_parse_field_facility);
-	tcase_add_test(tc_fmt, test_logger_parse_field_pid);
-	tcase_add_test(tc_fmt, test_logger_parse_field_ident);
-	tcase_add_test(tc_fmt, test_logger_parse_field_msg);
-	suite_add_tcase(s, tc_fmt);
+	tc_field_default = tcase_create("Logger format parsing default values");
+	tcase_add_test(tc_field_default, test_logger_parse_field_dtfmt_default);
+	tcase_add_test(tc_field_default, test_logger_parse_field_sz_default);
+	tcase_add_test(tc_field_default, test_logger_parse_field_datetime_default);
+	suite_add_tcase(s, tc_field_default);
+
+	tc_field = tcase_create("Logger format parsing");
+	tcase_add_test(tc_field, test_logger_parse_field_sz);
+	tcase_add_test(tc_field, test_logger_parse_field_datetime);
+	tcase_add_test(tc_field, test_logger_parse_field_level);
+	tcase_add_test(tc_field, test_logger_parse_field_facility);
+	tcase_add_test(tc_field, test_logger_parse_field_pid);
+	tcase_add_test(tc_field, test_logger_parse_field_ident);
+	tcase_add_test(tc_field, test_logger_parse_field_msg);
+	suite_add_tcase(s, tc_field);
+
+	tc_parse_err = tcase_create("Logger format parsing errors handling");
+	tcase_add_test(tc_parse_err, test_logger_parse_field_sz_err);
+	tcase_add_test(tc_parse_err, test_logger_parse_field_parse_err);
+	suite_add_tcase(s, tc_parse_err);
+	
 
 	return s;
 }