Merge lp:~thisfred/u1db/fix-my-faucet into lp:u1db

[Eric Casteleijn]

Fixed two memory leaks.

Fixed two memory leaks.

[Lucio Torre (lucio.torre)]

review: Approve

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 5/21/2012 8:31 PM, Eric Casteleijn wrote:
> Eric Casteleijn has proposed merging
> lp:~thisfred/u1db/fix-my-faucet into lp:u1db.
>
> Requested reviews: Ubuntu One hackers (ubuntuone-hackers)
>
> For more details, see:
> https://code.launchpad.net/~thisfred/u1db/fix-my-faucet/+merge/106685
>
> Fixed two memory leaks.

- - handle_status("create_index",
- - u1db_create_index(self._db, index_name, n_expressions,
expressions))
- - free(<void*>expressions)
+ try:
+ handle_status("create_index",
+ u1db_create_index(
+ self._db, index_name, n_expressions, expressions))
+ finally:
+ free(<void*>expressions)

This might be easier to read as:

status = u1db_create_index(...)
free(<void*>expressions)
handle_status(...)

Though the try/finally form seems fine, too.

 review: approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+7XKkACgkQJdeBCYSNAAOZ6ACbBQDTOSzqB4ztc65rxg0zWR3E
sFIAn09n56/yWYWhDTgJkmywwmMJRSw9
=MdU2
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'src/u1db_sync_target.c'
--- src/u1db_sync_target.c	2012-05-18 15:12:42 +0000
+++ src/u1db_sync_target.c	2012-05-21 18:33:19 +0000
@@ -282,7 +282,8 @@
     status = u1db__put_doc_if_newer(se->db, doc, 0, se->source_replica_uid,
                                     source_gen, NULL, &insert_state, &at_gen);
     if (insert_state == U1DB_INSERTED || insert_state == U1DB_CONVERGED) {
-	lh_table_insert(se->seen_ids, strdup(doc->doc_id), (void *)(intptr_t)at_gen);
+        lh_table_insert(se->seen_ids, strdup(doc->doc_id),
+        (void *)(intptr_t)at_gen);
     } else {
         // state should be either U1DB_SUPERSEDED or U1DB_CONFLICTED, in either
         // case, we don't count this as a 'seen_id' because we will want to be
@@ -311,7 +312,7 @@
     struct _whats_changed_doc_ids_state *state;
     state = (struct _whats_changed_doc_ids_state *)context;
     if (state->exclude_ids != NULL
-	&& (e = lh_table_lookup_entry(state->exclude_ids, doc_id)) != NULL
+        && (e = lh_table_lookup_entry(state->exclude_ids, doc_id)) != NULL
         && (intptr_t)e->v >= gen)
     {
         // This document was already seen at this gen,
@@ -560,7 +561,8 @@
     // fprintf(stderr, "Starting\n");
     if (db == NULL || target == NULL || local_gen_before_sync == NULL) {
         // fprintf(stderr, "DB, target, or local are NULL\n");
-        return U1DB_INVALID_PARAMETER;
+        status = U1DB_INVALID_PARAMETER;
+        goto finish;
     }
 
     status = u1db_get_replica_uid(db, &local_uid);
@@ -583,7 +585,7 @@
     if (local_gen == local_gen_known_by_target
         && target_gen == target_gen_known_by_local)
     {
-        return U1DB_OK;
+        goto finish;
     }
     *local_gen_before_sync = local_gen;
     return_doc_state.db = db;

=== modified file 'u1db/tests/c_backend_wrapper.pyx'
--- u1db/tests/c_backend_wrapper.pyx	2012-05-21 15:01:18 +0000
+++ u1db/tests/c_backend_wrapper.pyx	2012-05-21 18:33:19 +0000
@@ -1027,9 +1027,12 @@
         # remain valid.
         new_objs = _list_to_str_array(
             index_expression, &expressions, &n_expressions)
-        handle_status("create_index",
-            u1db_create_index(self._db, index_name, n_expressions, expressions))
-        free(<void*>expressions)
+        try:
+            handle_status("create_index",
+                u1db_create_index(
+                    self._db, index_name, n_expressions, expressions))
+        finally:
+            free(<void*>expressions)
 
     def list_indexes(self):
         a_list = []