libepc r233 - in trunk: . libepc

[murrayc svn gnome org]

Author: murrayc
Date: Tue Jul 29 11:32:36 2008
New Revision: 233
URL: http://svn.gnome.org/viewvc/libepc?rev=233&view=rev

Log:
2008-07-29  Murray Cumming  <murrayc murrayc com>

* libepc/publisher.c: epc_publisher_install_handlers(): Check for 
a NULL service_name before calling soup_auth_domain_digest_new() to 
avoid a crash. However, we need to know why it can be NULL and 
prevent that instead.
Bug #540631.

Modified:
   trunk/ChangeLog
   trunk/libepc/publisher.c

Modified: trunk/libepc/publisher.c
==============================================================================
--- trunk/libepc/publisher.c	(original)
+++ trunk/libepc/publisher.c	Tue Jul 29 11:32:36 2008
@@ -1147,13 +1147,22 @@
     }
   else
     {
-      self->priv->server_auth =
-        soup_auth_domain_digest_new (SOUP_AUTH_DOMAIN_REALM,
-                                     self->priv->service_name,
-                                     SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK,
-                                     epc_publisher_generic_auth_cb,
-                                     SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA,
-                                     self, NULL);
+      /* Check for NULL, to avoid a crash, 
+       * though we do not yet know why this would be NULL.
+       * See bug #540631.
+       */
+      if(NULL == self->priv->service_name)
+        g_warning("libepc: epc_publisher_install_handlers() service_name was NULL.");
+      else
+      {
+        self->priv->server_auth =
+          soup_auth_domain_digest_new (SOUP_AUTH_DOMAIN_REALM,
+                                       self->priv->service_name,
+                                       SOUP_AUTH_DOMAIN_GENERIC_AUTH_CALLBACK,
+                                       epc_publisher_generic_auth_cb,
+                                       SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA,
+                                       self, NULL);
+      }
     }
 
   soup_auth_domain_set_filter (self->priv->server_auth, epc_publisher_auth_filter, self, NULL);