From 16de4a71761efe69053fefb6f77f16ddfff63c0f Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Tue, 18 Nov 2014 14:09:34 +0100
Subject: [PATCH] Fix for potential NPE

---
 utils/src/com/cloud/utils/net/NetUtils.java   | 45 +++++++++----------
 .../com/cloud/utils/net/NetUtilsTest.java     | 35 ++++++++++-----
 2 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index b092c945b14..3ce36978452 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -19,16 +19,6 @@
 
 package com.cloud.utils.net;
 
-import com.cloud.utils.IteratorUtil;
-import com.cloud.utils.Pair;
-import com.cloud.utils.script.Script;
-import com.googlecode.ipv6.IPv6Address;
-import com.googlecode.ipv6.IPv6AddressRange;
-import com.googlecode.ipv6.IPv6Network;
-import org.apache.commons.lang.SystemUtils;
-import org.apache.commons.net.util.SubnetUtils;
-import org.apache.log4j.Logger;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -51,6 +41,18 @@ import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.net.util.SubnetUtils;
+import org.apache.log4j.Logger;
+
+import com.googlecode.ipv6.IPv6Address;
+import com.googlecode.ipv6.IPv6AddressRange;
+import com.googlecode.ipv6.IPv6Network;
+
+import com.cloud.utils.IteratorUtil;
+import com.cloud.utils.Pair;
+import com.cloud.utils.script.Script;
+
 public class NetUtils {
     protected final static Logger s_logger = Logger.getLogger(NetUtils.class);
     public final static String HTTP_PORT = "80";
@@ -321,6 +323,8 @@ public class NetUtils {
             }
         } catch (SocketException e) {
             s_logger.error("SocketException when trying to retrieve MAC address", e);
+        } finally {
+            formatter.close();
         }
         return sb.toString();
     }
@@ -456,6 +460,7 @@ public class NetUtils {
         StringBuilder result = new StringBuilder(17);
         Formatter formatter = new Formatter(result);
         formatter.format("%02x:%02x:%02x:%02x:%02x:%02x", m[0], m[1], m[2], m[3], m[4], m[5]);
+        formatter.close();
         return result.toString();
     }
 
@@ -464,7 +469,7 @@ public class NetUtils {
         Formatter formatter = new Formatter(result);
         formatter.format("%02x:%02x:%02x:%02x:%02x:%02x", (macAddress >> 40) & 0xff, (macAddress >> 32) & 0xff, (macAddress >> 24) & 0xff, (macAddress >> 16) & 0xff,
                 (macAddress >> 8) & 0xff, (macAddress & 0xff));
-
+        formatter.close();
         return result.toString();
     }
 
@@ -1307,20 +1312,14 @@ public class NetUtils {
         if (ips.length > 1) {
             endIp = ips[1];
         }
-        IPv6Address start, end;
         try {
-            start = IPv6Address.fromString(startIp);
-            end = IPv6Address.fromString(endIp);
-        } catch (IllegalArgumentException ex) {
-            return null;
-        }
-        BigInteger startInt = convertIPv6AddressToBigInteger(start);
-        BigInteger endInt = convertIPv6AddressToBigInteger(end);
-        if (endInt != null) {
-            if (startInt == null || startInt.compareTo(endInt) > 0) {
-                return null;
+            BigInteger startInt = convertIPv6AddressToBigInteger(IPv6Address.fromString(startIp));
+            BigInteger endInt = convertIPv6AddressToBigInteger(IPv6Address.fromString(endIp));
+            if (endInt != null && startInt != null && startInt.compareTo(endInt) <= 0) {
+                return endInt.subtract(startInt).add(BigInteger.ONE);
             }
-            return endInt.subtract(startInt).add(BigInteger.ONE);
+        } catch (IllegalArgumentException ex) {
+            s_logger.error("Failed to convert a string to an IPv6 address", ex);
         }
         return null;
     }
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java
index 96c3bafc631..e48faa1842a 100644
--- a/utils/test/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -19,14 +19,6 @@
 
 package com.cloud.utils.net;
 
-import com.googlecode.ipv6.IPv6Address;
-import org.apache.log4j.Logger;
-import org.junit.Test;
-
-import java.math.BigInteger;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
@@ -39,6 +31,15 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+import java.math.BigInteger;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.apache.log4j.Logger;
+import org.junit.Test;
+
+import com.googlecode.ipv6.IPv6Address;
+
 public class NetUtilsTest {
 
     private static final Logger s_logger = Logger.getLogger(NetUtilsTest.class);
@@ -138,8 +139,22 @@ public class NetUtilsTest {
 
     @Test
     public void testCountIp6InRange() {
-        assertEquals(NetUtils.countIp6InRange("1234:5678::1-1234:5678::2"), new BigInteger("2"));
-        assertEquals(NetUtils.countIp6InRange("1234:5678::2-1234:5678::0"), null);
+        assertEquals(new BigInteger("2"), NetUtils.countIp6InRange("1234:5678::1-1234:5678::2"));
+    }
+
+    @Test
+    public void testCountIp6InRangeWithInvalidRange() {
+        assertEquals(null, NetUtils.countIp6InRange("1234:5678::2-1234:5678::0"));
+    }
+
+    @Test
+    public void testCountIp6InRangeWithNullStart() {
+        assertEquals(null, NetUtils.countIp6InRange("-1234:5678::0"));
+    }
+
+    @Test
+    public void testCountIp6InRangeWithNoEnd() {
+        assertEquals(new BigInteger("1"), NetUtils.countIp6InRange("1234:5678::2"));
     }
 
     @Test