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

gproxyresolver: add asserts to ensure error is set

Browse Source 
This will catch buggy implementations of GProxyResolver before they are
able to return bogus results to higher level code. In particular, if
g_proxy_resolver_lookup() returns NULL, it'd better set an error to
explain why.
This commit is contained in:
Michael Catanzaro
2022-06-27 15:10:25 -05:00
parent 1738fad172
commit 8e29865112
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gproxyresolver.c
View File

@@ -158,6 +158,7 @@ g_proxy_resolver_lookup (GProxyResolver *resolver,
GError **error)
{
GProxyResolverInterface *iface;
gchar **proxy_uris;
g_return_val_if_fail (G_IS_PROXY_RESOLVER (resolver), NULL);
g_return_val_if_fail (uri != NULL, NULL);
@@ -171,7 +172,10 @@ g_proxy_resolver_lookup (GProxyResolver *resolver,
iface = G_PROXY_RESOLVER_GET_IFACE (resolver);
return (* iface->lookup) (resolver, uri, cancellable, error);
proxy_uris = (* iface->lookup) (resolver, uri, cancellable, error);
if (proxy_uris == NULL && error != NULL)
g_assert (*error != NULL);
return proxy_uris;
}
/**
@@ -237,10 +241,14 @@ g_proxy_resolver_lookup_finish (GProxyResolver *resolver,
GError **error)
{
GProxyResolverInterface *iface;
gchar **proxy_uris;
g_return_val_if_fail (G_IS_PROXY_RESOLVER (resolver), NULL);
iface = G_PROXY_RESOLVER_GET_IFACE (resolver);
return (* iface->lookup_finish) (resolver, result, error);
proxy_uris = (* iface->lookup_finish) (resolver, result, error);
if (proxy_uris == NULL && error != NULL)
g_assert (*error != NULL);
return proxy_uris;
}