Don't create a sh session inside a sh session

holzschu · Jun 4, 2020 · 9fc8f74 · 9fc8f74
1 parent a245026
commit 9fc8f74
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ios_system.m b/ios_system.m
@@ -951,9 +951,11 @@ int sh_main(int argc, char** argv) {
     }
     NSFileManager *fileManager = [[NSFileManager alloc] init];
     // NSLog(@"parentSession = %x currentSession = %x currentDir = %s\n", parentSession, currentSession, [fileManager currentDirectoryPath].UTF8String);
+    if (currentSession->context == sh_session) {
+        return 1; // We cannot have a sh command starting a sh command.
+    }
     if (parentSession == NULL) {
-        if (currentSession->context != sh_session)
-            parentSession = currentSession;
+        parentSession = currentSession;
         parentDir = [fileManager currentDirectoryPath];
     }
     ios_switchSession(&sh_session); // create a new session