odhcpd: avoid illegal memory access in some corner cases

[openwrt/openwrt.git] / package / network / ipv6 / odhcp6c / files / dhcpv6.script

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 8cfa929002b77f50cdbf4229cbf8373fde428da1..be74b01e4eb040e3756b4d0734e82ff5006f8a31 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -20,6 +20,14 @@ setup_interface () {
                proto_add_dns_server "$dns"
        done
 
+       for radomain in $RA_DOMAINS; do
+               local duplicate=0
+               for domain in $DOMAINS; do
+                       [ "$radomain" = "$domain" ] && duplicate=1
+               done
+               [ "$duplicate" = 0 ] && DOMAINS="$DOMAINS $radomain"
+       done
+
        for domain in $DOMAINS; do
                proto_add_dns_search "$domain"
        done