From 64b4eac2f0ccfe6eae9028e6b87744e51b60d13f Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 29 Sep 2014 15:58:54 +0200
Subject: Try to recover from broken PIE support on some device (Asus EEEPad)
 (closes issue #275)

---
 .../main/java/de/blinkt/openvpn/VpnProfile.java    |  6 ++++++
 .../java/de/blinkt/openvpn/core/OpenVPNThread.java | 25 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 44ea8203..666337b7 100644
--- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -168,6 +168,12 @@ public class VpnProfile implements Serializable {
             return VpnProfile.MININONPIEVPN;
     }
 
+    public static String[] replacePieWithNoPie(String[] mArgv)
+    {
+        mArgv[0] = mArgv[0].replace(MINIPIEVPN, MININONPIEVPN);
+        return mArgv;
+    }
+
     public static String openVpnEscape(String unescaped) {
         if (unescaped == null)
             return null;
diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
index 5d04a330..e79dbe0c 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
@@ -30,6 +30,7 @@ import de.blinkt.openvpn.core.VpnStatus.LogItem;
 
 public class OpenVPNThread implements Runnable {
     private static final String DUMP_PATH_STRING = "Dump path: ";
+    private static final String BROKEN_PIE_SUPPORT = "/data/data/de.blinkt.openvpn/cache/pievpn[1]: syntax error:";
 	private static final String TAG = "OpenVPN";
     public static final int M_FATAL = (1 << 4);
     public static final int M_NONFATAL = (1 << 5);
@@ -41,8 +42,9 @@ public class OpenVPNThread implements Runnable {
 	private OpenVPNService mService;
 	private String mDumpPath;
 	private Map<String, String> mProcessEnv;
+    private boolean mBrokenPie=false;
 
-	public OpenVPNThread(OpenVPNService service,String[] argv, Map<String,String> processEnv, String nativelibdir)
+    public OpenVPNThread(OpenVPNService service,String[] argv, Map<String,String> processEnv, String nativelibdir)
 	{
 		mArgv = argv;
 		mNativeDir = nativelibdir;
@@ -73,8 +75,22 @@ public class OpenVPNThread implements Runnable {
 			} catch (InterruptedException ie) {
 				VpnStatus.logError("InterruptedException: " + ie.getLocalizedMessage());
 			}
-			if( exitvalue != 0)
-				VpnStatus.logError("Process exited with exit value " + exitvalue);
+			if( exitvalue != 0) {
+                VpnStatus.logError("Process exited with exit value " + exitvalue);
+                if (mBrokenPie) {
+                    String[] noPieArgv = VpnProfile.replacePieWithNoPie(mArgv);
+
+                    // We are already noPIE, nothing to gain
+                    if (!noPieArgv.equals(mArgv)) {
+                        mArgv = noPieArgv;
+                        VpnStatus.logInfo("PIE Version could not be executed. Trying no PIE version");
+                        run();
+                        return;
+                    }
+
+                }
+
+            }
 			
 			VpnStatus.updateStateString("NOPROCESS", "No process running.", R.string.state_noprocess, ConnectionStatus.LEVEL_NOTCONNECTED);
 			if(mDumpPath!=null) {
@@ -128,6 +144,9 @@ public class OpenVPNThread implements Runnable {
 
 				if (logline.startsWith(DUMP_PATH_STRING))
 					mDumpPath = logline.substring(DUMP_PATH_STRING.length());
+
+                if (logline.startsWith(BROKEN_PIE_SUPPORT))
+                    mBrokenPie = true;
 					
 
                 // 1380308330.240114 18000002 Send to HTTP proxy: 'X-Online-Host: bla.blabla.com'
-- 
cgit v1.2.3