4 files changed, 26 insertions, 15 deletions

diff --git a/luni/src/main/native/ifaddrs-android.h b/luni/src/main/native/ifaddrs-android.h
index de87b02..1b9a9ef 100644
--- a/luni/src/main/native/ifaddrs-android.h
+++ b/luni/src/main/native/ifaddrs-android.h
@@ -136,6 +136,11 @@ struct ifaddrs {
         }
         return NULL;
     }
+
+private:
+    // Disallow copy and assignment.
+    ifaddrs(const ifaddrs&);
+    void operator=(const ifaddrs&);
 };
 
 // FIXME: use iovec instead.
diff --git a/luni/src/main/native/java_io_File.cpp b/luni/src/main/native/java_io_File.cpp
index 586ebbe..3006275 100644
--- a/luni/src/main/native/java_io_File.cpp
+++ b/luni/src/main/native/java_io_File.cpp
@@ -253,6 +253,10 @@ private:
     DIR* mDirStream;
     dirent mEntry;
     bool mIsBad;
+
+    // Disallow copy and assignment.
+    ScopedReaddir(const ScopedReaddir&);
+    void operator=(const ScopedReaddir&);
 };
 
 // DirEntry and DirEntries is a minimal equivalent of std::forward_list
@@ -310,6 +314,10 @@ public:
 private:
     size_t mSize;
     DirEntry* mHead;
+
+    // Disallow copy and assignment.
+    DirEntries(const DirEntries&);
+    void operator=(const DirEntries&);
 };
 
 // Reads the directory referred to by 'pathBytes', adding each directory entry
diff --git a/luni/src/main/native/java_net_InetAddress.cpp b/luni/src/main/native/java_net_InetAddress.cpp
index 04c18af..62318e9 100644
--- a/luni/src/main/native/java_net_InetAddress.cpp
+++ b/luni/src/main/native/java_net_InetAddress.cpp
@@ -83,8 +83,7 @@ static jobjectArray InetAddress_getaddrinfoImpl(JNIEnv* env, const char* name) {
         // Count results so we know how to size the output array.
         int addressCount = 0;
         for (addrInfo = addressList; addrInfo; addrInfo = addrInfo->ai_next) {
-            if (addrInfo->ai_family == AF_INET ||
-                addrInfo->ai_family == AF_INET6) {
+            if (addrInfo->ai_family == AF_INET || addrInfo->ai_family == AF_INET6) {
                 addressCount++;
             }
         }
@@ -94,7 +93,7 @@ static jobjectArray InetAddress_getaddrinfoImpl(JNIEnv* env, const char* name) {
         if (addressArray == NULL) {
             // Appropriate exception will be thrown.
             LOGE("getaddrinfo: could not allocate array of size %i", addressCount);
-            freeaddrinfo(addrInfo);
+            freeaddrinfo(addressList);
             return NULL;
         }
 
@@ -109,20 +108,17 @@ static jobjectArray InetAddress_getaddrinfoImpl(JNIEnv* env, const char* name) {
                 // Find the raw address length and start pointer.
                 case AF_INET6:
                     addressLength = 16;
-                    rawAddress =
-                        &((struct sockaddr_in6*) address)->sin6_addr.s6_addr;
+                    rawAddress = &((struct sockaddr_in6*) address)->sin6_addr.s6_addr;
                     logIpString(addrInfo, name);
                     break;
                 case AF_INET:
                     addressLength = 4;
-                    rawAddress =
-                        &((struct sockaddr_in*) address)->sin_addr.s_addr;
+                    rawAddress = &((struct sockaddr_in*) address)->sin_addr.s_addr;
                     logIpString(addrInfo, name);
                     break;
                 default:
                     // Unknown address family. Skip this address.
-                    LOGE("getaddrinfo: Unknown address family %d",
-                         addrInfo->ai_family);
+                    LOGE("getaddrinfo: Unknown address family %d", addrInfo->ai_family);
                     continue;
             }
 
@@ -130,13 +126,11 @@ static jobjectArray InetAddress_getaddrinfoImpl(JNIEnv* env, const char* name) {
             jbyteArray bytearray = env->NewByteArray(addressLength);
             if (bytearray == NULL) {
                 // Out of memory error will be thrown on return.
-                LOGE("getaddrinfo: Can't allocate %d-byte array",
-                     addressLength);
+                LOGE("getaddrinfo: Can't allocate %d-byte array", addressLength);
                 addressArray = NULL;
                 break;
             }
-            env->SetByteArrayRegion(bytearray, 0, addressLength,
-                                    (jbyte*) rawAddress);
+            env->SetByteArrayRegion(bytearray, 0, addressLength, (jbyte*) rawAddress);
             env->SetObjectArrayElement(addressArray, index, bytearray);
             env->DeleteLocalRef(bytearray);
             index++;
@@ -146,8 +140,7 @@ static jobjectArray InetAddress_getaddrinfoImpl(JNIEnv* env, const char* name) {
         jniThrowException(env, "java/lang/SecurityException",
             "Permission denied (maybe missing INTERNET permission)");
     } else {
-        jniThrowException(env, "java/net/UnknownHostException",
-                gai_strerror(result));
+        jniThrowException(env, "java/net/UnknownHostException", gai_strerror(result));
     }
 
     if (addressList) {
diff --git a/luni/src/main/native/java_net_NetworkInterface.cpp b/luni/src/main/native/java_net_NetworkInterface.cpp
index 724e988..4aea781 100644
--- a/luni/src/main/native/java_net_NetworkInterface.cpp
+++ b/luni/src/main/native/java_net_NetworkInterface.cpp
@@ -53,6 +53,11 @@ public:
     }
     
     ifaddrs* list;
+
+private:
+    // Disallow copy and assignment.
+    ScopedInterfaceAddresses(const ScopedInterfaceAddresses&);
+    void operator=(const ScopedInterfaceAddresses&);
 };
 
 // TODO: add a header file for shared utilities like this.