From e12177cdea32e5de194de95c8f6fb1a5c11a9dc4 Mon Sep 17 00:00:00 2001
From: Jan Kadlec <jan.kadlec@nic.cz>
Date: Mon, 19 May 2014 22:42:00 +0200
Subject: [PATCH] unittests: Fixed process-answer unittest crashes. Needs
review.
---
src/knot/nameserver/process_answer.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/knot/nameserver/process_answer.c b/src/knot/nameserver/process_answer.c
index c8d118c83..12c7c426a 100644
--- a/src/knot/nameserver/process_answer.c
+++ b/src/knot/nameserver/process_answer.c
@@ -44,11 +44,7 @@ static void answer_data_init(knot_process_t *ctx, void *module_param)
*/
static bool is_answer_to_query(const knot_pkt_t *query, knot_pkt_t *answer)
{
- bool ret = knot_wire_get_id(query->wire) == knot_wire_get_id(answer->wire);
- if (!ret) {
- assert(0);
- }
- return ret;
+ return knot_wire_get_id(query->wire) == knot_wire_get_id(answer->wire);
}
static int process_answer_begin(knot_process_t *ctx, void *module_param)
@@ -104,6 +100,9 @@ static int process_answer(knot_pkt_t *pkt, knot_process_t *ctx)
ANSWER_REQUIRES(knot_wire_get_qr(pkt->wire), NS_PROC_NOOP);
/* Check if we want answer paired to query. */
const knot_pkt_t *query = data->param->query;
+ if (!query) {
+ return NS_PROC_FAIL;
+ }
ANSWER_REQUIRES(is_answer_to_query(query, pkt), NS_PROC_NOOP);
/* Verify incoming packet. */
--
GitLab