Config/Interface: Allow copyFrom() to work on null

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-08-23 18:02:37 -05:00
parent d3e6b311ca
commit 0e46f95668
2 changed files with 28 additions and 11 deletions
@@ -29,11 +29,19 @@ public class Interface extends BaseObservable implements Copyable<Interface>, Ob

    @Override
    public void copyFrom(final Interface source) {
-        address = source.address;
-        dns = source.dns;
-        listenPort = source.listenPort;
-        setPrivateKey(source.privateKey);
-        mtu = source.mtu;
+        if (source != null) {
+            address = source.address;
+            dns = source.dns;
+            listenPort = source.listenPort;
+            mtu = source.mtu;
+            setPrivateKey(source.privateKey);
+        } else {
+            address = null;
+            dns = null;
+            listenPort = null;
+            mtu = null;
+            setPrivateKey(null);
+        }
    }

    public void generateKeypair() {