From b4f4b80269c8afb13cf011af0fb3ef9c7805459c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Mon, 1 Mar 2010 19:05:03 +0000 Subject: [PATCH] Make sure query response is cleared if we happen to bail out early. Fixed ticket #145 --- src/epg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/epg.c b/src/epg.c index 68ef8c4b..8c89ef74 100644 --- a/src/epg.c +++ b/src/epg.c @@ -622,11 +622,12 @@ epg_query0(epg_query_result_t *eqr, channel_t *ch, channel_tag_t *ct, { channel_tag_mapping_t *ctm; time_t now; - - time(&now); - regex_t preg0, *preg; + lock_assert(&global_lock); + memset(eqr, 0, sizeof(epg_query_result_t)); + time(&now); + if(title != NULL) { if(regcomp(&preg0, title, REG_ICASE | REG_EXTENDED | REG_NOSUB)) return; @@ -635,9 +636,6 @@ epg_query0(epg_query_result_t *eqr, channel_t *ch, channel_tag_t *ct, preg = NULL; } - lock_assert(&global_lock); - memset(eqr, 0, sizeof(epg_query_result_t)); - if(ch != NULL && ct == NULL) { epg_query_add_channel(eqr, ch, ecg, preg, now); return;