Merge branch 'uri-parsing-fix' into 'master'

GUri build fixes

See merge request GNOME/glib!1554
This commit is contained in:
Sebastian Dröge
2020-06-29 11:24:17 +00:00
2 changed files with 6 additions and 1 deletions

View File

@@ -3,14 +3,18 @@
int int
LLVMFuzzerTestOneInput (const unsigned char *data, size_t size) LLVMFuzzerTestOneInput (const unsigned char *data, size_t size)
{ {
unsigned char *nul_terminated_data = NULL;
GUri *uri = NULL; GUri *uri = NULL;
gchar *uri_string = NULL; gchar *uri_string = NULL;
const GUriFlags flags = G_URI_FLAGS_NONE; const GUriFlags flags = G_URI_FLAGS_NONE;
fuzz_set_logging_func (); fuzz_set_logging_func ();
/* ignore @size */ /* ignore @size (g_uri_parse() doesnt support it); ensure @data is nul-terminated */
nul_terminated_data = (unsigned char *) g_strndup ((const gchar *) data, size);
uri = g_uri_parse ((const gchar *) data, flags, NULL); uri = g_uri_parse ((const gchar *) data, flags, NULL);
g_free (nul_terminated_data);
if (uri == NULL) if (uri == NULL)
return 0; return 0;

View File

@@ -196,6 +196,7 @@ glib/gshell.c
glib/gspawn.c glib/gspawn.c
glib/gspawn-win32.c glib/gspawn-win32.c
glib/gstrfuncs.c glib/gstrfuncs.c
glib/guri.c
glib/gutf8.c glib/gutf8.c
glib/gutils.c glib/gutils.c
glib/guuid.c glib/guuid.c