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

Merge branch '1768-strlcat-test-fix' into 'master'

Browse Source 
tests: Increase buffer size for g_strlcat() tests

Closes #1768

See merge request GNOME/glib!811
This commit is contained in:
Sebastian Dröge 2019-05-02 14:55:36 +00:00
commit 9be2ce31d5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glib/tests/strfuncs.c
View File

@ -312,7 +312,7 @@ static void
test_strlcat (void)
{
gchar *str = "The quick brown fox jumps over the lazy dog";
gchar str_cpy[45] = { 0 };
gchar str_cpy[60] = { 0 };
gsize str_cpy_size = 0;
if (g_test_undefined ())
@ -340,28 +340,28 @@ test_strlcat (void)
* Note that the @dest_size argument to g_strlcat() is normally meant to be
* set to `sizeof (dest)`. We set it to various values `≤ sizeof (str_cpy)`
* for testing purposes. */
g_assert_cmpuint (strlen (str) + 1, <=, sizeof (str_cpy));
str_cpy_size = g_strlcat (str_cpy, str, strlen (str) + 1);
g_assert_nonnull (str_cpy);
g_assert_cmpstr (str, ==, str_cpy);
g_assert_cmpint (str_cpy_size, ==, strlen (str));
g_assert_cmpuint (strlen (str), <=, sizeof (str_cpy));
str_cpy_size = g_strlcat (str_cpy, str, strlen (str));
g_assert_nonnull (str_cpy);
g_assert_cmpstr (str, ==, str_cpy);
g_assert_cmpint (str_cpy_size, ==, 2 * strlen (str));
g_assert_cmpuint (strlen (str) - 15, <=, sizeof (str_cpy));
str_cpy_size = g_strlcat (str_cpy, str, strlen (str) - 15);
g_assert_nonnull (str_cpy);
g_assert_cmpstr (str, ==, str_cpy);
g_assert_cmpint (str_cpy_size, ==, 2 * strlen (str) - 15);
g_assert_cmpuint (0, <=, sizeof (str_cpy));
str_cpy_size = g_strlcat (str_cpy, str, 0);
g_assert_nonnull (str_cpy);
g_assert_cmpstr (str, ==, str_cpy);
g_assert_cmpint (str_cpy_size, ==, strlen (str));
g_assert_cmpuint (strlen (str) + 15, <=, sizeof (str_cpy));
str_cpy_size = g_strlcat (str_cpy, str, strlen (str) + 15);
g_assert_nonnull (str_cpy);
g_assert_cmpstr ("The quick brown fox jumps over the lazy dogThe quick brow",
==, str_cpy);
g_assert_cmpint (str_cpy_size, ==, 2 * strlen (str));