NetUtils: Check for NPE in getDefaultHostIp method when processing nic/mac

yadvr · yadvr · commit 7ada4ad50b68 · 2014-08-21T11:41:07.000+02:00
On hosts or containers where they don't have valid mac address on nic resulting
in null, NetUtils.getNetworkParam can throw NPE.

This was a case found on TravisCI where OpenVZ containers are used. This method
(getDefaultHostIp) is used at several other places within the ACS codebase to
get the host IP and if null is caught we fallback to localhost or 127.0.0.1, so
we therefore set info to null before trying to process network param and if we
fail we return null and expect other layers to use localhost.

Signed-off-by: Rohit Yadav &lt;rohit.yadav@shapeblue.com&gt;
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -191,7 +191,12 @@ public static String getDefaultHostIp() {
                 return null;
             }
 
-            String[] info = NetUtils.getNetworkParams(nic);
+            String[] info = null;
+            try {
+                info = NetUtils.getNetworkParams(nic);
+            } catch (NullPointerException ignored) {
+                s_logger.debug("Caught NullPointerException when trying to getDefaultHostIp");
+            }
             if (info != null) {
                 return info[0];
             }

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,12 @@ public static String getDefaultHostIp() {`
`191`	`191`	`return null;`
`192`	`192`	`}`
`193`	`193`
`194`		`- String[] info = NetUtils.getNetworkParams(nic);`
	`194`	`+ String[] info = null;`
	`195`	`+ try {`
	`196`	`+ info = NetUtils.getNetworkParams(nic);`
	`197`	`+ } catch (NullPointerException ignored) {`
	`198`	`+ s_logger.debug("Caught NullPointerException when trying to getDefaultHostIp");`
	`199`	`+ }`
`195`	`200`	`if (info != null) {`
`196`	`201`	`return info[0];`
`197`	`202`	`}`