GApplication: add a "resource base path"

[platform/upstream/glib.git] / gio / gthreadedresolver.c

diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
index 8e8d07e..9bb864c 100644 (file)
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
@@ -96,9 +96,22 @@ do_lookup_by_name (GTask         *task,
           g_object_unref (sockaddr);
         }
 
-      addresses = g_list_reverse (addresses);
-      g_task_return_pointer (task, addresses,
-                             (GDestroyNotify)g_resolver_free_addresses);
+      if (addresses != NULL)
+        {
+          addresses = g_list_reverse (addresses);
+          g_task_return_pointer (task, addresses,
+                                 (GDestroyNotify)g_resolver_free_addresses);
+        }
+      else
+        {
+          /* All addresses failed to be converted to GSocketAddresses. */
+          g_task_return_new_error (task,
+                                   G_RESOLVER_ERROR,
+                                   G_RESOLVER_ERROR_NOT_FOUND,
+                                   _("Error resolving '%s': %s"),
+                                   hostname,
+                                   _("No valid addresses were found"));
+        }
     }
   else
     {