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

contenttype test: don't pass -1 as length

Browse Source 
g_content_type_guess() takes a gsize, not a gssize, and -1 does not mean
"I am passing a NULL terminated string".
This commit is contained in:
Ryan Lortie
2012-05-01 15:40:15 -04:00
parent 8db824e00b
commit 56ca8add10
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gio/tests/contenttype.c
View File

@@ -1,4 +1,5 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <string.h>
static void static void
test_guess (void) test_guess (void)
@@ -6,7 +7,7 @@ test_guess (void)
gchar *res; gchar *res;
gchar *expected; gchar *expected;
gboolean uncertain; gboolean uncertain;
guchar *data = (guchar*) guchar data[] =
"[Desktop Entry]\n" "[Desktop Entry]\n"
"Type=Application\n" "Type=Application\n"
"Name=appinfo-test\n" "Name=appinfo-test\n"
@@ -26,28 +27,28 @@ test_guess (void)
g_free (res); g_free (res);
g_free (expected); g_free (expected);
res = g_content_type_guess ("foo.desktop", data, -1, &uncertain); res = g_content_type_guess ("foo.desktop", data, sizeof (data) - 1, &uncertain);
expected = g_content_type_from_mime_type ("application/x-desktop"); expected = g_content_type_from_mime_type ("application/x-desktop");
g_assert (g_content_type_equals (expected, res)); g_assert (g_content_type_equals (expected, res));
g_assert (!uncertain); g_assert (!uncertain);
g_free (res); g_free (res);
g_free (expected); g_free (expected);
res = g_content_type_guess ("foo.txt", data, -1, &uncertain); res = g_content_type_guess ("foo.txt", data, sizeof (data) - 1, &uncertain);
expected = g_content_type_from_mime_type ("text/plain"); expected = g_content_type_from_mime_type ("text/plain");
g_assert (g_content_type_equals (expected, res)); g_assert (g_content_type_equals (expected, res));
g_assert (!uncertain); g_assert (!uncertain);
g_free (res); g_free (res);
g_free (expected); g_free (expected);
res = g_content_type_guess ("foo", data, -1, &uncertain); res = g_content_type_guess ("foo", data, sizeof (data) - 1, &uncertain);
expected = g_content_type_from_mime_type ("text/plain"); expected = g_content_type_from_mime_type ("text/plain");
g_assert (g_content_type_equals (expected, res)); g_assert (g_content_type_equals (expected, res));
g_assert (!uncertain); g_assert (!uncertain);
g_free (res); g_free (res);
g_free (expected); g_free (expected);
res = g_content_type_guess (NULL, data, -1, &uncertain); res = g_content_type_guess (NULL, data, sizeof (data) - 1, &uncertain);
expected = g_content_type_from_mime_type ("application/x-desktop"); expected = g_content_type_from_mime_type ("application/x-desktop");
g_assert (g_content_type_equals (expected, res)); g_assert (g_content_type_equals (expected, res));
g_assert (!uncertain); g_assert (!uncertain);