From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 10 Jul 2017 10:17:45 +0000 (+0200)
Subject: android: Catch OutOfMemoryError when importing profiles
X-Git-Tag: 5.6.1dr2~10^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac3189f7927c0df662c874f8be1b90a95bea0e6e;p=thirdparty%2Fstrongswan.git

android: Catch OutOfMemoryError when importing profiles

Not sure if this is actually caused because e.g. the file is too large
or due to some encoding issue.
---

diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
index 5cfcf48954..cee95c36ff 100644
--- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
+++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
@@ -65,6 +65,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.OutOfMemoryError;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.security.KeyStore;
@@ -715,7 +716,14 @@ public class VpnProfileImportActivity extends AppCompatActivity
 			}
 			if (in != null)
 			{
-				result.Profile = streamToString(in);
+				try
+				{
+					result.Profile = streamToString(in);
+				}
+				catch (OutOfMemoryError e)
+				{	/* just use a generic exception */
+					result.ThrownException = new RuntimeException();
+				}
 			}
 			return result;
 		}