Fix trackdb_search() deadlock handling.

diff --git a/lib/trackdb.c b/lib/trackdb.c
index 628498a0cbcc89e7bfaaea6d6412246e8bdc5dff..24d04accfb711ded4d3dbc2d613a1be88d05cfa2 100644 (file)
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -2493,6 +2493,9 @@ char **trackdb_search(char **wordlist, int nwordlist, int *ntracks) {
     }
     if(trackdb_closecursor(cursor)) err = DB_LOCK_DEADLOCK;
     cursor = 0;
     }
     if(trackdb_closecursor(cursor)) err = DB_LOCK_DEADLOCK;
     cursor = 0;

+    if(err)
+      goto fail;
+    cursor = 0;

     /* do a naive search over that (hopefuly fairly small) list of tracks */
     u.nvec = 0;
     for(n = 0; n < v.nvec; ++n) {
     /* do a naive search over that (hopefuly fairly small) list of tracks */
     u.nvec = 0;
     for(n = 0; n < v.nvec; ++n) {