From 4038ae200598b47b8a93a87981cdf851bc1bf757 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Tue, 19 Feb 2013 16:47:07 +0000 Subject: [PATCH] Fix crash in DHCPv6 information-request handler. --- CHANGELOG | 5 +++++ src/rfc3315.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index f9b8dbc..d2ae0dd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,6 +38,11 @@ version 2.66 agent. Thanks to Lakefield Communications for providing a bounty for this addition. + Fixed crash, introduced in 2.64, whilst handling DHCPv6 + information-requests with some common configurations. + Thanks to Robert M. Albrecht for the bug report and + chasing the problem. + version 2.65 Fix regression which broke forwarding of queries sent via diff --git a/src/rfc3315.c b/src/rfc3315.c index 75ec06b..785a426 100644 --- a/src/rfc3315.c +++ b/src/rfc3315.c @@ -1027,7 +1027,7 @@ static int dhcp6_no_relay(int msg_type, struct in6_addr *link_address, struct dh { /* We can't discriminate contexts based on address, as we don't know it. If there is only one possible context, we can use its tags */ - if (context && !context->current) + if (context && context->netid.net && !context->current) { context->netid.next = NULL; context_tags = &context->netid;