YLOG_DEBUG for stmt in client_incref

[pazpar2-moved-to-github.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index c41960d..e2c66d3 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -414,6 +414,7 @@ int session_set_watch(struct session *s, int what,
 
 void session_alert_watch(struct session *s, int what)
 {
+    assert(s);
     session_enter(s);
     if (s->watchlist[what].fun)
     {
@@ -498,11 +499,11 @@ enum pazpar2_error_code search(struct session *se,
     *addinfo = 0;
     
     session_enter(se);
+    reclist_destroy(se->reclist);
+    se->reclist = 0;
     nmem_reset(se->nmem);
     se->relevance = 0;
     se->total_records = se->total_hits = se->total_merged = 0;
-    reclist_destroy(se->reclist);
-    se->reclist = 0;
     se->num_termlists = 0;
     live_channels = select_targets(se, filter);
     if (!live_channels)