2005-02-02 David Daney <ddaney@avtrex.com>

	* java/net/InetAddress.java (InetAddress): Make a private copy of
	the address.
	* java/net/Inet4Address.java (getAddress): Return a copy of the
	address.
	* java/net/Inet6Address.java (Inet6Address): Use private copy of
	the address
	(getAddress): Return a copy of the address.
	(equals): Rewrote.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@94664 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 20 insertions, 7 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b7d1c39ca93..1ee4076912b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-02  David Daney  <ddaney@avtrex.com>
+
+	* java/net/InetAddress.java (InetAddress): Make a private copy of
+	the address.
+	* java/net/Inet4Address.java (getAddress): Return a copy of the
+	address.
+	* java/net/Inet6Address.java (Inet6Address): Use private copy of
+	the address
+	(getAddress): Return a copy of the address.
+	(equals): Rewrote.
+
 2005-02-02  Tom Tromey  <tromey@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff --git a/libjava/java/net/Inet4Address.java b/libjava/java/net/Inet4Address.java
index 917e9e3e667..b654ce6cddb 100644
--- a/libjava/java/net/Inet4Address.java
+++ b/libjava/java/net/Inet4Address.java
@@ -207,7 +207,7 @@ public final class Inet4Address extends InetAddress
    */
   public byte[] getAddress()
   {
-    return addr;
+    return (byte[]) addr.clone();
   }
 
   /**
diff --git a/libjava/java/net/Inet6Address.java b/libjava/java/net/Inet6Address.java
index 0c1d60e8edf..69d266a4c17 100644
--- a/libjava/java/net/Inet6Address.java
+++ b/libjava/java/net/Inet6Address.java
@@ -65,7 +65,8 @@ public final class Inet6Address extends InetAddress
   Inet6Address(byte[] addr, String host)
   {
     super(addr, host);
-    this.ipaddress = addr;
+    // Super constructor clones the addr.  Get a reference to the clone.
+    this.ipaddress = this.addr;
   }
 
   /**
@@ -194,7 +195,7 @@ public final class Inet6Address extends InetAddress
    */
   public byte[] getAddress()
   {
-    return ipaddress;
+    return (byte[]) ipaddress.clone();
   }
 
   /**
@@ -233,9 +234,10 @@ public final class Inet6Address extends InetAddress
     if (! (obj instanceof Inet6Address))
       return false;
 
-    Inet6Address tmp = (Inet6Address) obj;
-
-    return super.equals(tmp) && this.ipaddress == tmp.ipaddress;
+    // this.ipaddress is never set in this class except to
+    // the value of the super class' addr.  The super classes
+    // equals(Object) will do the compare.
+    return super.equals(obj);
   }
 
   /**
diff --git a/libjava/java/net/InetAddress.java b/libjava/java/net/InetAddress.java
index cfcf22b4268..5a3ec474cf9 100644
--- a/libjava/java/net/InetAddress.java
+++ b/libjava/java/net/InetAddress.java
@@ -123,7 +123,7 @@ public class InetAddress implements Serializable
    */
   InetAddress(byte[] ipaddr, String hostname)
   {
-    addr = ipaddr;
+    addr = (null == ipaddr) ? null : (byte[]) ipaddr.clone();
     hostName = hostname;
     
     if (ipaddr != null)