[Opensync-commits] r1281 - trunk/libsyncml/data_sync_api

[<svn...@op...>]

Author: bellmich
Date: Thu Sep 24 19:07:03 2009
New Revision: 1281
URL: http://libsyncml.opensync.org/changeset/1281

Log:
added some more error checks

Modified:
   trunk/libsyncml/data_sync_api/data_sync_server.c
   trunk/libsyncml/data_sync_api/sml_data_sync_session.c

Modified: trunk/libsyncml/data_sync_api/data_sync_server.c
==============================================================================
--- trunk/libsyncml/data_sync_api/data_sync_server.c	Thu Sep 24 19:06:45 2009	(r1280)
+++ trunk/libsyncml/data_sync_api/data_sync_server.c	Thu Sep 24 19:07:03 2009	(r1281)
@@ -48,6 +48,11 @@
 	GError *error = NULL;
 	SmlAlertType sentType = recvType;
 
+	if (!self->priv->data_store_session)
+		self->priv->data_store_session = dsession;
+
+	smlAssert(self->priv->data_store_session == dsession);
+
 	/* libsyncml only supports SML_ALERT_TWO_WAY and SML_ALERT_SLOW_SYNC
 	 * but some old phones reply on a SAN alert 206 with a slow sync 201
 	 * alert or a SAN alert 206 (insteed of a normal two way alert 200).

Modified: trunk/libsyncml/data_sync_api/sml_data_sync_session.c
==============================================================================
--- trunk/libsyncml/data_sync_api/sml_data_sync_session.c	Thu Sep 24 19:06:45 2009	(r1280)
+++ trunk/libsyncml/data_sync_api/sml_data_sync_session.c	Thu Sep 24 19:07:03 2009	(r1281)
@@ -230,6 +230,10 @@
                                               GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s (%p, %p, %p)", __func__, self, datastore, error);
+	CHECK_ERROR_REF
+	sml_return_val_error_if_fail (SML_IS_DATA_SYNC_SESSION (self), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncSession object.");
+	sml_return_val_error_if_fail (SML_IS_DATA_SYNC_DATA_STORE (datastore), FALSE, error, SML_ERROR_GENERIC, "There must be a SmlDataSyncDataStore object.");
+
 	smlTrace(TRACE_INTERNAL, "%s: %s", __func__, sml_data_sync_data_store_get_local_uri(datastore));
 	SmlDataSyncDataStoreSession *data_store_session = g_hash_table_lookup(self->priv->hash_dsds2dsdss, datastore);
 	if (!data_store_session) {