luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-19 08:42:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Run GMarkup tests with and without nul-termination

Browse Source 
When using GMarkup to parse a string, the string can be provided with an
explicit length specified, or with no length and a nul terminator
instead. Run all the GMarkup tests both ways, to catch problems with
length checks, or with nul terminator checks.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2018-08-02 11:01:02 +01:00
parent f23ae18d79
commit 29c1b6e72c
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
glib/tests/markup-parse.c
View File

@ -148,7 +148,7 @@ test_in_chunks (const gchar *contents,
static int static int
test_file (const gchar *filename, GMarkupParseFlags flags) test_file (const gchar *filename, GMarkupParseFlags flags)
{ {
gchar *contents; gchar *contents = NULL, *contents_unterminated = NULL;
gsize length; gsize length;
GError *error; GError *error;
GMarkupParseContext *context; GMarkupParseContext *context;
@ -165,12 +165,13 @@ test_file (const gchar *filename, GMarkupParseFlags flags)
return 1; return 1;
} }
/* Test with nul termination. */
context = g_markup_parse_context_new (&parser, flags, NULL, NULL); context = g_markup_parse_context_new (&parser, flags, NULL, NULL);
g_assert (g_markup_parse_context_get_user_data (context) == NULL); g_assert (g_markup_parse_context_get_user_data (context) == NULL);
g_markup_parse_context_get_position (context, &line, &col); g_markup_parse_context_get_position (context, &line, &col);
g_assert (line == 1 && col == 1); g_assert (line == 1 && col == 1);
if (!g_markup_parse_context_parse (context, contents, length, NULL)) if (!g_markup_parse_context_parse (context, contents, -1, NULL))
{ {
g_markup_parse_context_free (context); g_markup_parse_context_free (context);
g_free (contents); g_free (contents);
@ -186,6 +187,28 @@ test_file (const gchar *filename, GMarkupParseFlags flags)
g_markup_parse_context_free (context); g_markup_parse_context_free (context);
/* With the length specified explicitly and a nul terminator present (since
* g_file_get_contents() always adds one). */
if (test_in_chunks (contents, length, length, flags) != 0)
{
g_free (contents);
return 1;
}
/* With the length specified explicitly and no nul terminator present. */
contents_unterminated = g_malloc (length);
if (contents_unterminated != NULL)
memcpy (contents_unterminated, contents, length);
if (test_in_chunks (contents_unterminated, length, length, flags) != 0)
{
g_free (contents);
g_free (contents_unterminated);
return 1;
}
g_free (contents_unterminated);
/* A byte at a time */ /* A byte at a time */
if (test_in_chunks (contents, length, 1, flags) != 0) if (test_in_chunks (contents, length, 1, flags) != 0)
{ {