Fix new non-root shell crash

topjohnwu · Jan 20, 2018 · ab447b2 · ab447b2
1 parent fa5e659
commit ab447b2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/superuser/src/main/java/com/topjohnwu/superuser/Shell.java b/superuser/src/main/java/com/topjohnwu/superuser/Shell.java
@@ -86,7 +86,6 @@ private static void testShell(Shell shell) throws IOException {
         shell.STDIN.flush();
         String s = new BufferedReader(new InputStreamReader(shell.STDOUT)).readLine();
         if (TextUtils.isEmpty(s) || !s.contains("SHELL_TEST")) {
-            shell.close();
             throw new IOException();
         }
     }
@@ -96,7 +95,6 @@ private static void testRootShell(Shell shell) throws IOException {
         shell.STDIN.flush();
         String s = new BufferedReader(new InputStreamReader(shell.STDOUT)).readLine();
         if (TextUtils.isEmpty(s) || !s.contains("uid=0")) {
-            shell.close();
             throw new IOException();
         }
     }
@@ -150,6 +148,7 @@ private static Shell getShell(ShellContainer container) throws NoShellException
             } catch (IOException e) {
                 // Shell initialize failed
                 Utils.stackTrace(e);
+                shell = null;
             }
         }
 
@@ -167,6 +166,7 @@ private static Shell getShell(ShellContainer container) throws NoShellException
             } catch (IOException e) {
                 // Shell initialize failed
                 Utils.stackTrace(e);
+                shell = null;
             }
         }