luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-10-28 10:06:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'andyholmes/resolver-ownership' into 'main'

Browse Source 
gthreadedresolver: ref-sink returned records in lookup_records()

Closes #3393

See merge request GNOME/glib!4110
This commit is contained in:
Philip Withnall 2024-07-05 06:26:51 +00:00
commit 8320085557
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gthreadedresolver.c
View File

@ -1079,7 +1079,7 @@ g_resolver_records_from_res_query (const gchar *rrname,
}
if (record != NULL)
records = g_list_prepend (records, record);
records = g_list_prepend (records, g_variant_ref_sink (record));
if (parsing_error != NULL)
break;

41
gio/tests/resolver-parsing.c
View File

@ -177,6 +177,7 @@ assert_query_succeeds (const gchar *rrname,
answer_variant = records->data;
expected_answer_variant = g_variant_new_parsed (expected_answer_variant_str);
g_assert_cmpvariant (answer_variant, expected_answer_variant);
g_assert_true (!g_variant_is_floating (answer_variant));
g_variant_unref (expected_answer_variant);
g_list_free_full (records, (GDestroyNotify) g_variant_unref);
@ -223,6 +224,45 @@ test_invalid_header (void)
}
}
static void
test_record_ownership (void)
{
GByteArray *answer = NULL, *txt_rdata = NULL;
GList *records = NULL;
GError *local_error = NULL;
uint16_t rrtype;
rrtype = g_resolver_record_type_to_rrtype (G_RESOLVER_RECORD_TXT);
answer = dns_header ();
/* Resource record */
dns_builder_add_domain (answer, "example.org");
dns_builder_add_uint16 (answer, rrtype);
dns_builder_add_uint16 (answer, 1); /* qclass=C_IN */
dns_builder_add_uint32 (answer, 0); /* ttl (ignored) */
/* TXT rdata, https://datatracker.ietf.org/doc/html/rfc1035#section-3.3.14 */
txt_rdata = g_byte_array_new ();
dns_builder_add_length_prefixed_string (txt_rdata, "some test content");
dns_builder_add_answer_data (answer, txt_rdata);
g_byte_array_unref (txt_rdata);
records = g_resolver_records_from_res_query ("example.org",
rrtype,
answer->data,
answer->len,
0,
&local_error);
g_assert_no_error (local_error);
g_assert_nonnull (records);
for (const GList *iter = records; iter != NULL; iter = iter->next)
g_assert_true (!g_variant_is_floating (records->data));
g_list_free_full (records, (GDestroyNotify) g_variant_unref);
g_byte_array_free (answer, TRUE);
}
static void
test_unknown_record_type (void)
{
@ -858,6 +898,7 @@ main (int argc,
g_test_init (&argc, &argv, G_TEST_OPTION_ISOLATE_DIRS, NULL);
g_test_add_func ("/gresolver/invalid-header", test_invalid_header);
g_test_add_func ("/gresolver/record-ownership", test_record_ownership);
g_test_add_func ("/gresolver/unknown-record-type", test_unknown_record_type);
g_test_add_func ("/gresolver/mx/valid", test_mx_valid);
g_test_add_func ("/gresolver/mx/invalid", test_mx_invalid);