Handle non-message arguments in fallback script

httptoolkit · Nov 8, 2023 · 61cb054 · 61cb054
1 parent 4cb2d44
commit 61cb054
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/android/android-certificate-unpinning-fallback.js b/android/android-certificate-unpinning-fallback.js
@@ -108,10 +108,14 @@ Java.perform(function () {
         };
 
         const buildUnhandledErrorPatcher = (errorClassName, originalConstructor) => {
-            return function (errorMessage) {
+            return function (errorArg) {
                 try {
                     console.log('\n !!! --- Unexpected TLS failure --- !!!');
 
+                    // This may be a message, or an cause, or plausibly maybe other types? But
+                    // stringifying gives something consistently message-shaped, so that'll do.
+                    const errorMessage = errorArg?.toString() ?? '';
+
                     // Parse the stack trace to work out who threw this error:
                     const stackTrace = Java.use('java.lang.Thread').currentThread().getStackTrace();
                     const exceptionStackIndex = stackTrace.findIndex(stack =>