Changeset 3566

Timestamp:

08/20/08 11:02:40 (3 months ago)

Author:

bricks

Message:

Added missing osync_trace(TRACE_EXIT) in osync_member_get_config
ensure that objtype is not null to avoid segfault in osync_obj_engine_new

Location:

trunk/opensync

Files:

• engine/opensync_obj_engine.c (modified) (1 diff)
• group/opensync_member.c (modified) (1 diff)

trunk/opensync/engine/opensync_obj_engine.c

@@ -621 +621 @@
 OSyncObjEngine *osync_obj_engine_new(OSyncEngine *parent, const char *objtype, OSyncFormatEnv *formatenv, OSyncError **error)
 {
+        osync_assert(parent);
+        osync_assert(objtype);
+        
         osync_trace(TRACE_ENTRY, "%s(%p, %s, %p, %p)", __func__, parent, objtype, formatenv, error);
-        g_assert(parent);
-        g_assert(objtype);
         
         OSyncObjEngine *engine = osync_try_malloc0(sizeof(OSyncObjEngine), error);

trunk/opensync/group/opensync_member.c

@@ -464 +464 @@
         osync_member_set_config(member, config);
 
+        osync_trace(TRACE_EXIT, "%s", __func__);
         return config;