aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSUZUKI, Shinsuke <suz@kame.net>2008-05-01 04:16:32 +0000
committerBjørn Mork <bjorn@mork.no>2010-08-06 15:37:37 +0200
commit11a55076be9d96f1958e3ece5769eef22850f880 (patch)
tree0f4d85e1d71a1bd0e225ce5e757dcc02e5655c14
parentb88854558c6b97a5e98d2b61dc129d24cb9944a3 (diff)
fixed a improper handling of a domain-name ending with '.'. (Bug-ID: 1852869)
-rw-r--r--CHANGES2
-rw-r--r--common.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 3838f37..950b57c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@
* config.c: fixed a possible memory leak. (Bug-ID 1847588)
* dhcp6s.c: fixed a lifetime calculation failure in RENEW/REBIND
process for stateful-address. (Bug-ID: 1850457)
+ * common.c: fixed a improper handling of a domain-name ending with '.'.
+ (Bug-ID: 1852869)
2007-12-06 SUZUKI, Shinsuke <suz@kame.net>
* common.c: fixed a possible memory leak. (Bug-ID 1844676)
diff --git a/common.c b/common.c
index 3538c00..f35399c 100644
--- a/common.c
+++ b/common.c
@@ -513,7 +513,7 @@ dhcp6_set_domain(type, list, p, optep, len)
memcpy(cp, name, nlen);
cp += nlen;
}
- if (copy_option(type, optlen, tmpbuf, p, optep, len) != 0) {
+ if (copy_option(type, cp - tmpbuf, tmpbuf, p, optep, len) != 0) {
free(tmpbuf);
return -1;
}