From a6e62afc1f38323ccb861f4da771af85187d8ac0 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 1 Mar 2017 12:58:16 +0000
Subject: [PATCH] Servlet: Catch OOM in MultiPartRequest

---
 apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java b/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java
index 5ba917d4b..a40a67e43 100644
--- a/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java
+++ b/apps/jetty/java/src/net/i2p/servlet/RequestWrapper.java
@@ -43,7 +43,7 @@ import org.mortbay.servlet.MultiPartRequest;
  *  See https://bugs.eclipse.org/bugs/show_bug.cgi?id=349110
  *
  *  So we could either extend and fix MultiPartFilter, and rewrite everything here,
- *  or copy MultiParRequest into our war and fix it so it compiles with Jetty 6.
+ *  or copy MultiPartRequest into our war and fix it so it compiles with Jetty 6.
  *  We do the latter.
  *
  *  The filter would have been added in web.xml,
@@ -71,8 +71,11 @@ public class RequestWrapper {
 		if( contentType != null && contentType.toLowerCase(Locale.US).startsWith( "multipart/form-data" ) ) {
 			try {
 				mpr = new MultiPartRequest( httpRequest );
+			} catch (OutOfMemoryError oome) {
+				// TODO Throw ioe from constructor?
+				oome.printStackTrace();
 			} catch (IOException e) {
-				// TODO Auto-generated catch block
+				// TODO Throw ioe from constructor?
 				e.printStackTrace();
 			}
 		}