From d01295b3f51f952f3da397376a80d99303d7e92c Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 25 Dec 2012 20:33:16 +0800
Subject: [PATCH] fix a crash when timeout in Exec

---
 AndroidManifest.xml                   |  4 ++--
 pom.xml                               |  2 +-
 src/com/github/shadowsocks/Utils.java | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b135d10c..d9d08b09 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.github.shadowsocks"
           android:installLocation="auto"
-          android:versionCode="7"
-          android:versionName="1.1.3">
+          android:versionCode="8"
+          android:versionName="1.1.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/pom.xml b/pom.xml
index 98410fac..7cf510bf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.shadowsocks</groupId>
     <artifactId>shadowsocks</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <packaging>apk</packaging>
     <name>Shadowsocks</name>
 
diff --git a/src/com/github/shadowsocks/Utils.java b/src/com/github/shadowsocks/Utils.java
index 3f3c5c69..f00d9bf1 100755
--- a/src/com/github/shadowsocks/Utils.java
+++ b/src/com/github/shadowsocks/Utils.java
@@ -271,6 +271,21 @@ public class Utils {
         private final boolean asroot;
         public int exitcode = -1;
 
+        private int[] pid = new int[1];
+        private FileDescriptor pipe;
+
+        @Override
+        public void destroy() {
+            if (pid[0] != -1) {
+                Exec.hangupProcessGroup(pid[0]);
+                pid[0] = -1;
+            }
+            if (pipe != null) {
+                Exec.close(pipe);
+                pipe = null;
+            }
+        }
+
         /**
          * Creates a new script runner.
          *
@@ -344,8 +359,6 @@ public class Utils {
 
         @Override
         public void run() {
-            FileDescriptor pipe = null;
-            int pid[] = new int[1];
             pid[0] = -1;
 
             try {