Changed: Do not hang indefinitely when exceptions are thrown in TermuxApiReceiver and ResultReturner

agnostic-apollo · agnostic-apollo · commit 3c1a6be86ff0 · 2022-03-21T22:37:35.000+05:00
diff --git a/app/src/main/java/com/termux/api/TermuxApiReceiver.java b/app/src/main/java/com/termux/api/TermuxApiReceiver.java
@@ -46,6 +46,7 @@
 import com.termux.api.apis.WallpaperAPI;
 import com.termux.api.apis.WifiAPI;
 import com.termux.api.activities.TermuxApiPermissionActivity;
+import com.termux.api.util.ResultReturner;
 import com.termux.shared.data.IntentUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.termux.TermuxConstants;
@@ -70,6 +71,8 @@ public void onReceive(Context context, Intent intent) {
 
             TermuxCrashUtils.sendPluginCrashReportNotification(context, LOG_TAG,
                     TermuxConstants.TERMUX_API_APP_NAME + " Error", message, e);
+
+            ResultReturner.noteDone(this, intent);
         }
     }
 
diff --git a/app/src/main/java/com/termux/api/util/ResultReturner.java b/app/src/main/java/com/termux/api/util/ResultReturner.java
@@ -148,38 +148,41 @@ public static void returnData(Object context, final Intent intent, final ResultW
         final Activity activity = (Activity) ((context instanceof Activity) ? context : null);
 
         final Runnable runnable = () -> {
+            PrintWriter writer = null;
+            LocalSocket outputSocket = null;
             try {
                 final ParcelFileDescriptor[] pfds = { null };
-                try (LocalSocket outputSocket = new LocalSocket()) {
-                    String outputSocketAdress = intent.getStringExtra(SOCKET_OUTPUT_EXTRA);
-                    outputSocket.connect(new LocalSocketAddress(outputSocketAdress));
-                    try (PrintWriter writer = new PrintWriter(outputSocket.getOutputStream())) {
-                        if (resultWriter != null) {
-                            if (resultWriter instanceof BinaryOutput) {
-                                BinaryOutput bout = (BinaryOutput) resultWriter;
-                                bout.setOutput(outputSocket.getOutputStream());
-                            }
-                            if (resultWriter instanceof WithInput) {
-                                try (LocalSocket inputSocket = new LocalSocket()) {
-                                    String inputSocketAdress = intent.getStringExtra(SOCKET_INPUT_EXTRA);
-                                    inputSocket.connect(new LocalSocketAddress(inputSocketAdress));
-                                    ((WithInput) resultWriter).setInput(inputSocket.getInputStream());
-                                    resultWriter.writeResult(writer);
-                                }
-                            } else {
-                                resultWriter.writeResult(writer);
-                            }
-                            if(resultWriter instanceof WithAncillaryFd) {
-                                int fd = ((WithAncillaryFd) resultWriter).getFd();
-                                if (fd >= 0) {
-                                    pfds[0] = ParcelFileDescriptor.adoptFd(fd);
-                                    FileDescriptor[] fds = { pfds[0].getFileDescriptor() };
-                                    outputSocket.setFileDescriptorsForSend(fds);
-                                }
-                            }
+                outputSocket = new LocalSocket();
+                String outputSocketAdress = intent.getStringExtra(SOCKET_OUTPUT_EXTRA);
+                Logger.logDebug(LOG_TAG, "Connecting to output socket \"" + outputSocketAdress + "\"");
+                outputSocket.connect(new LocalSocketAddress(outputSocketAdress));
+                writer = new PrintWriter(outputSocket.getOutputStream());
+
+                if (resultWriter != null) {
+                    if (resultWriter instanceof BinaryOutput) {
+                        BinaryOutput bout = (BinaryOutput) resultWriter;
+                        bout.setOutput(outputSocket.getOutputStream());
+                    }
+                    if (resultWriter instanceof WithInput) {
+                        try (LocalSocket inputSocket = new LocalSocket()) {
+                            String inputSocketAdress = intent.getStringExtra(SOCKET_INPUT_EXTRA);
+                            inputSocket.connect(new LocalSocketAddress(inputSocketAdress));
+                            ((WithInput) resultWriter).setInput(inputSocket.getInputStream());
+                            resultWriter.writeResult(writer);
+                        }
+                    } else {
+                        resultWriter.writeResult(writer);
+                    }
+                    if(resultWriter instanceof WithAncillaryFd) {
+                        int fd = ((WithAncillaryFd) resultWriter).getFd();
+                        if (fd >= 0) {
+                            pfds[0] = ParcelFileDescriptor.adoptFd(fd);
+                            FileDescriptor[] fds = { pfds[0].getFileDescriptor() };
+                            outputSocket.setFileDescriptorsForSend(fds);
                         }
                     }
                 }
+
                 if(pfds[0] != null) {
                     pfds[0].close();
                 }
@@ -202,14 +205,23 @@ public static void returnData(Object context, final Intent intent, final ResultW
                     activity.setResult(1);
                 }
             } finally {
+                try {
+                    if (writer != null)
+                        writer.close();
+                    if (outputSocket != null)
+                        outputSocket.close();
+                } catch (Exception e) {
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Failed to close", e);
+                }
+
                 try {
                     if (asyncResult != null) {
                         asyncResult.finish();
                     } else if (activity != null) {
                         activity.finish();
                     }
                 } catch (Exception e) {
-                    Logger.logStackTraceWithMessage(LOG_TAG, "Failed to cleanup", e);
+                    Logger.logStackTraceWithMessage(LOG_TAG, "Failed to finish", e);
                 }
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`import com.termux.api.apis.WallpaperAPI;`
`47`	`47`	`import com.termux.api.apis.WifiAPI;`
`48`	`48`	`import com.termux.api.activities.TermuxApiPermissionActivity;`
	`49`	`+import com.termux.api.util.ResultReturner;`
`49`	`50`	`import com.termux.shared.data.IntentUtils;`
`50`	`51`	`import com.termux.shared.logger.Logger;`
`51`	`52`	`import com.termux.shared.termux.TermuxConstants;`
`@@ -70,6 +71,8 @@ public void onReceive(Context context, Intent intent) {`
`70`	`71`
`71`	`72`	`TermuxCrashUtils.sendPluginCrashReportNotification(context, LOG_TAG,`
`72`	`73`	`TermuxConstants.TERMUX_API_APP_NAME + " Error", message, e);`
	`74`	`+`
	`75`	`+ ResultReturner.noteDone(this, intent);`
`73`	`76`	`}`
`74`	`77`	`}`
`75`	`78`