Merge branch 'patch-1' of https://github.com/neheb/ppp

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/pppd/multilink.c b/pppd/multilink.c
index eb4074d905b395bf52db30e605bc01f457a3c531..3aee0bcf6876686e73599835c483a1d585824cba 100644 (file)
--- a/pppd/multilink.c
+++ b/pppd/multilink.c
@@ -445,13 +445,9 @@ get_default_epdisc(ep)
        if (p != 0 && get_if_hwaddr(ep->value, p) >= 0) {
                ep->class = EPD_MAC;
                ep->length = 6;
-               free(p);
                return 1;
        }
 
-       if (p)
-               free(p);
-
        /* see if our hostname corresponds to a reasonable IP address */
        hp = gethostbyname(hostname);
        if (hp != NULL) {