Changeset 2405

Timestamp:

08/05/07 10:14:08 (1 year ago)

Author:

paule

Message:

Protect access to some plugin env structure members with a mutex

Files:

• plugins/opie-sync/src/opie_sync.c (modified) (4 diffs)
• plugins/opie-sync/src/opie_sync.h (modified) (1 diff)

plugins/opie-sync/src/opie_sync.c

@@ -219 +219 @@
-        OSyncError *error = NULL;
-
+        g_mutex_lock(env->plugin_env->plugin_mutex);
+        
-        if(!env->plugin_env->connected) {
-                /* We only want to connect once per session */
-
+
+
-                        goto error;
+                }
-                env->plugin_env->connected = TRUE;
-        }
@@ -230 +234 @@
-                opie_fetch_file(env->plugin_env, OPIE_OBJECT_TYPE_CATEGORY, OPIE_CATEGORY_FILE, &env->plugin_env->categories_doc, NULL);
-        }
+        
+        g_mutex_unlock(env->plugin_env->plugin_mutex);
-        
-        /* pull the required data back */
@@ -611 +617 @@
-        
-        env->backuppath = NULL;
+        env->plugin_mutex = g_mutex_new();
-        
-        /* Contacts sink */
@@ -670 +677 @@
-        g_free(env->uidmap_file);
-        
+        g_mutex_free(env->plugin_mutex);
+        
-        g_free(env->contact_env);
+        g_free(env->todo_env);
+        g_free(env->event_env);
+        g_free(env->note_env);
-        g_free(env);
-        

plugins/opie-sync/src/opie_sync.h

@@ -82 +82 @@
-        GTree*            uidmap;
-        char*             uidmap_file;
+        
+        GMutex*           plugin_mutex;
-};
-