luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-08 18:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Test the length argument of g_uri_parse_params()

Browse Source 
Modify the existing test function to run each test twice: once
nul-terminated and once with a length specified.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2020-07-01 11:41:27 +01:00
parent 67c9d34d71
commit 836fee7a08
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
glib/tests/uri.c
View File

@ -1187,8 +1187,9 @@ test_uri_is_valid (void)
} }
static void static void
test_uri_parse_params (void) test_uri_parse_params (gconstpointer test_data)
{ {
gboolean use_nul_terminated = GPOINTER_TO_INT (test_data);
const struct const struct
{ {
/* Inputs */ /* Inputs */
@ -1214,13 +1215,30 @@ test_uri_parse_params (void)
for (i = 0; i < G_N_ELEMENTS (tests); i++) for (i = 0; i < G_N_ELEMENTS (tests); i++)
{ {
GHashTable *params; GHashTable *params;
gchar *uri = NULL;
gssize uri_len;
g_test_message ("URI %" G_GSIZE_FORMAT ": %s", i, tests[i].uri); g_test_message ("URI %" G_GSIZE_FORMAT ": %s", i, tests[i].uri);
g_assert (tests[i].expected_n_params < 0 || g_assert (tests[i].expected_n_params < 0 ||
tests[i].expected_n_params <= G_N_ELEMENTS (tests[i].expected_param_key_values) / 2); tests[i].expected_n_params <= G_N_ELEMENTS (tests[i].expected_param_key_values) / 2);
params = g_uri_parse_params (tests[i].uri, -1, tests[i].separator, tests[i].case_insensitive); /* The tests get run twice: once with the length unspecified, using a
* nul-terminated string; and once with the length specified and a copy of
* the string with the trailing nul explicitly removed (to help catch
* buffer overflows). */
if (use_nul_terminated)
{
uri_len = -1;
uri = g_strdup (tests[i].uri);
}
else
{
uri_len = strlen (tests[i].uri); /* no trailing nul */
uri = g_memdup (tests[i].uri, uri_len);
}
params = g_uri_parse_params (uri, uri_len, tests[i].separator, tests[i].case_insensitive);
if (tests[i].expected_n_params < 0) if (tests[i].expected_n_params < 0)
{ {
@ -1238,6 +1256,7 @@ test_uri_parse_params (void)
} }
g_clear_pointer (&params, g_hash_table_unref); g_clear_pointer (&params, g_hash_table_unref);
g_free (uri);
} }
} }
@ -1284,7 +1303,8 @@ main (int argc,
g_test_add_func ("/uri/is_valid", test_uri_is_valid); g_test_add_func ("/uri/is_valid", test_uri_is_valid);
g_test_add_func ("/uri/to-string", test_uri_to_string); g_test_add_func ("/uri/to-string", test_uri_to_string);
g_test_add_func ("/uri/join", test_uri_join); g_test_add_func ("/uri/join", test_uri_join);
g_test_add_func ("/uri/parse-params", test_uri_parse_params); g_test_add_data_func ("/uri/parse-params/nul-terminated", GINT_TO_POINTER (TRUE), test_uri_parse_params);
g_test_add_data_func ("/uri/parse-params/length", GINT_TO_POINTER (FALSE), test_uri_parse_params);
return g_test_run (); return g_test_run ();
} }