[telepathy-gabble/master] Assert that object patch are non-NULL after setting them

Sjoerd Simons sjoerd.simons at collabora.co.uk
Wed Dec 23 15:53:40 PST 2009


---
 src/call-content-codecoffer.c |    2 +-
 src/call-content.c            |    2 +-
 src/call-stream-endpoint.c    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/call-content-codecoffer.c b/src/call-content-codecoffer.c
index fe233fe..cd7f01b 100644
--- a/src/call-content-codecoffer.c
+++ b/src/call-content-codecoffer.c
@@ -114,8 +114,8 @@ gabble_call_content_codecoffer_set_property (GObject *object,
   switch (property_id)
     {
       case PROP_OBJECT_PATH:
-        g_free (priv->object_path);
         priv->object_path = g_value_dup_string (value);
+        g_assert (priv->object_path != NULL);
         break;
       case PROP_REMOTE_CONTACT_CODEC_MAP:
         priv->codec_map = g_value_dup_boxed (value);
diff --git a/src/call-content.c b/src/call-content.c
index 96e9feb..016f14b 100644
--- a/src/call-content.c
+++ b/src/call-content.c
@@ -205,8 +205,8 @@ gabble_call_content_set_property (GObject *object,
   switch (property_id)
     {
       case PROP_OBJECT_PATH:
-        g_free (priv->object_path);
         priv->object_path = g_value_dup_string (value);
+        g_assert (priv->object_path != NULL);
         break;
       case PROP_JINGLE_CONTENT:
         priv->content = g_value_dup_object (value);
diff --git a/src/call-stream-endpoint.c b/src/call-stream-endpoint.c
index ae95bb7..8381568 100644
--- a/src/call-stream-endpoint.c
+++ b/src/call-stream-endpoint.c
@@ -167,8 +167,8 @@ gabble_call_stream_endpoint_set_property (GObject *object,
   switch (property_id)
     {
       case PROP_OBJECT_PATH:
-        g_free (priv->object_path);
         priv->object_path = g_value_dup_string (value);
+        g_assert (priv->object_path != NULL);
         break;
       case PROP_JINGLE_CONTENT:
         priv->content = g_value_dup_object (value);
-- 
1.5.6.5




More information about the telepathy-commits mailing list