[Opensync-commits] r5194 - plugins/google-calendar/src

[<dg...@su...>]

Author: savago
Date: Mon Jan 19 19:46:17 2009
New Revision: 5194
URL: http://www.opensync.org/changeset/5194

Log:
Fixing memory leak (returned anchor needs to be cleaned up).

Modified:
   plugins/google-calendar/src/gcalendar.c

Modified: plugins/google-calendar/src/gcalendar.c
==============================================================================
--- plugins/google-calendar/src/gcalendar.c	Mon Jan 19 19:28:22 2009	(r5193)
+++ plugins/google-calendar/src/gcalendar.c	Mon Jan 19 19:46:17 2009	(r5194)
@@ -218,14 +218,15 @@
 
 	timestamp = osync_anchor_retrieve(osync_objtype_sink_get_anchor(plgdata->gcal_sink),
 					  &anchor_error);
+	if (!timestamp) {
+		msg = "gcalendar: Anchor returned is NULL!";
+		goto error;
+	}
+
 	if (strlen(timestamp) > 0)
 		osync_trace(TRACE_INTERNAL, "timestamp is: %s\n", timestamp);
-	else {
-		if (timestamp)
-			free(timestamp);
-		timestamp = NULL;
+	else
 		osync_trace(TRACE_INTERNAL, "first sync!\n");
-	}
 
 	if (osync_objtype_sink_get_slowsync(plgdata->gcal_sink)) {
 		osync_trace(TRACE_INTERNAL, "\n\t\tgcal: Client asked for slow syncing...\n");
@@ -328,11 +329,15 @@
 	osync_trace(TRACE_INTERNAL, "\ndone calendar: %s\n", buffer);
 
 exit:
+	/* osync_anchor_retrieve uses osync_strdup */
+	osync_free(timestamp);
 	osync_context_report_success(ctx);
 	return;
 
 cleanup:
 	osync_error_unref(&error);
+	/* osync_anchor_retrieve uses osync_strdup */
+	osync_free(timestamp);
 
 error:
 	osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, msg);
@@ -364,14 +369,15 @@
 
 	timestamp = osync_anchor_retrieve(osync_objtype_sink_get_anchor(plgdata->gcont_sink),
 					  &anchor_error);
+	if (!timestamp) {
+		msg = "gcontact: Anchor returned is NULL!";
+		goto error;
+	}
+
 	if (strlen(timestamp) > 0)
 		osync_trace(TRACE_INTERNAL, "timestamp is: %s\n", timestamp);
-	else {
-		if (timestamp)
-			free(timestamp);
-		timestamp = NULL;
+	else
 		osync_trace(TRACE_INTERNAL, "first sync!\n");
-	}
 
 	if (osync_objtype_sink_get_slowsync(plgdata->gcont_sink)) {
 		osync_trace(TRACE_INTERNAL, "\n\t\tgcont: Client asked for slow syncing...\n");
@@ -475,11 +481,15 @@
 	osync_trace(TRACE_INTERNAL, "\ndone contact: %s\n", buffer);
 
 exit:
+	/* osync_anchor_retrieve uses osync_strdup */
+	osync_free(timestamp);
 	osync_context_report_success(ctx);
 	return;
 
 cleanup:
 	osync_error_unref(&error);
+	/* osync_anchor_retrieve uses osync_strdup */
+	osync_free(timestamp);
 
 error:
 	osync_context_report_error(ctx, OSYNC_ERROR_GENERIC, msg);