From 0f7a3dba8744703c270ec04eb33734989afe92ee Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sat, 30 Aug 2014 02:38:27 +0000
Subject: [PATCH] Catch AIOOB in upnp code (triggered in I2P Android on
 shutdown)

---
 router/java/src/org/cybergarage/upnp/ControlPoint.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/router/java/src/org/cybergarage/upnp/ControlPoint.java b/router/java/src/org/cybergarage/upnp/ControlPoint.java
index a0e62360b..0da72f676 100644
--- a/router/java/src/org/cybergarage/upnp/ControlPoint.java
+++ b/router/java/src/org/cybergarage/upnp/ControlPoint.java
@@ -292,7 +292,14 @@ public class ControlPoint implements HTTPRequestListener
 		DeviceList devList = new DeviceList();
 		int nRoots = devNodeList.size();
 		for (int n=0; n<nRoots; n++) {
-			Node rootNode = devNodeList.getNode(n);
+			// AIOOB was thrown from here, maybe would be better to
+			// copy the list before traversal?
+			Node rootNode;
+			try {
+				rootNode = devNodeList.getNode(n);
+			} catch (ArrayIndexOutOfBoundsException aioob) {
+				break;
+			}
 			Device dev = getDevice(rootNode);
 			if (dev == null)
 				continue;