Changeset 1851

Timestamp:

03/17/07 11:08:06 (21 months ago)

Author:

mjahn

Message:

- fix patch based on XmpmPatches? 019-sqlite_memory_leaks_and_api_usage

Files:

• branches/branch-0.2X/opensync/opensync/opensync_db.c (modified) (8 diffs)

branches/branch-0.2X/opensync/opensync/opensync_db.c

@@ -38 +38 @@
         if (rc) {
                 osync_error_set(error, OSYNC_ERROR_GENERIC, "Cannot open database: %s", sqlite3_errmsg(db->db));
-                goto error_free;
+                goto error_close;
         }
         sqlite3_trace(db->db, osync_db_trace, NULL);
@@ -45 +45 @@
         return db;
 
-error_free:
+error_close:
+        osync_db_close(db);
+//error_free:
         g_free(db);
 error:
@@ -57 +59 @@
         
         int ret = sqlite3_close(db->db);
-        if (ret)
+        if (ret != SQLITE_OK)
                 osync_trace(TRACE_INTERNAL, "Can't close database: %s", sqlite3_errmsg(db->db));
         
@@ -70 +72 @@
         if (sqlite3_prepare(db->db, query, -1, &ppStmt, NULL) != SQLITE_OK)
                 osync_debug("OSDB", 3, "Unable prepare count! %s", sqlite3_errmsg(db->db));
-        if (sqlite3_step(ppStmt) != SQLITE_OK)
+        ret = sqlite3_step(ppStmt);
+        if (ret != SQLITE_DONE && ret != SQLITE_ROW)
                 osync_debug("OSDB", 3, "Unable step count! %s", sqlite3_errmsg(db->db));
+        if (ret == SQLITE_DONE)
+                osync_debug("OSDB", 3, "No row found!");
         ret = sqlite3_column_int64(ppStmt, 0);
         sqlite3_finalize(ppStmt);
@@ -85 +90 @@
         if (!(log_db = osync_db_open(filename, error))) {
                 osync_error_update(error, "Unable to load changelog: %s", osync_error_print(error));
+                g_free(filename);
                 osync_trace(TRACE_EXIT_ERROR, "%s: %s", __func__, osync_error_print(error));
                 return NULL;
@@ -481 +487 @@
         char *filename = g_strdup_printf ("%s/anchor.db", member->configdir);
         if (!(sdb = osync_db_open(filename, error))) {
+                g_free(filename);
                 osync_error_update(error, "Unable to open anchor table: %s", (*error)->message);
                 return NULL;
@@ -503 +510 @@
         if (sqlite3_prepare(sdb->db, query, -1, &ppStmt, NULL) != SQLITE_OK)
                 osync_debug("OSDB", 3, "Unable prepare anchor! %s", sqlite3_errmsg(sdb->db));
-        sqlite3_step(ppStmt);
+        int ret = sqlite3_step(ppStmt);
+        if (ret != SQLITE_DONE && ret != SQLITE_ROW)
+                osync_debug("OSDB", 3, "Unable step count! %s", sqlite3_errmsg(sdb->db));
+        if (ret == SQLITE_DONE)
+                osync_debug("OSDB", 3, "No row found!");
         *retanchor = g_strdup((gchar*)sqlite3_column_text(ppStmt, 0));
         sqlite3_finalize(ppStmt);
@@ -527 +538 @@
         char *filename = g_strdup_printf ("%s/hash.db", member->configdir);
         if (!(table->dbhandle = osync_db_open(filename, error))) {
+                g_free(filename);
                 osync_error_update(error, "Unable to open hashtable: %s", (*error)->message);
                 return FALSE;