[sipcapture] fix bad conditions

(cherry picked from commit 4caa2ac)
OpenSIPS · May 4, 2016 · ef5f3b5 · ef5f3b5
1 parent c24abca
commit ef5f3b5
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c
@@ -2230,13 +2230,13 @@ static void destroy(void)
 	/* execute the uninserted queries - async only */
 	if (DB_CAPABILITY(db_funcs, DB_CAP_ASYNC_RAW_QUERY)) {
 		while (it) {
-			if (HAVE_SHARED_QUERIES && CURR_QUERIES(it->as_qry)) {
-				query_str.s = QUERY_BUF(it->as_qry);
-				query_str.len = QUERY_LEN(it->as_qry);
-				do_remaining_queries(&query_str);
-			}
+			if (it->as_qry && HAVE_SHARED_QUERIES) {
+				if (CURR_QUERIES(it->as_qry)) {
+					query_str.s = QUERY_BUF(it->as_qry);
+					query_str.len = QUERY_LEN(it->as_qry);
+					do_remaining_queries(&query_str);
+				}
 
-			if (HAVE_SHARED_QUERIES) {
 				shm_free(LAST_SUFFIX(it->as_qry).s);
 				DESTROY_QUERY_LOCK(it->as_qry);
 				shm_free(it->as_qry);
@@ -2249,13 +2249,13 @@ static void destroy(void)
 
 		it=rc_list;
 		while (it) {
-			if (HAVE_SHARED_QUERIES && CURR_QUERIES(it->as_qry)) {
-				query_str.s = QUERY_BUF(it->as_qry);
-				query_str.len = QUERY_LEN(it->as_qry);
-				do_remaining_queries(&query_str);
-			}
+			if (it->as_qry && HAVE_SHARED_QUERIES) {
+				if (CURR_QUERIES(it->as_qry)) {
+					query_str.s = QUERY_BUF(it->as_qry);
+					query_str.len = QUERY_LEN(it->as_qry);
+					do_remaining_queries(&query_str);
+				}
 
-			if (HAVE_SHARED_QUERIES) {
 				shm_free(LAST_SUFFIX(it->as_qry).s);
 				DESTROY_QUERY_LOCK(it->as_qry);
 				shm_free(it->as_qry);