From 9727f4e88f7a9af233de07112794988ef9c1d61c Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Fri, 2 Aug 2019 09:39:39 -0700
Subject: [PATCH] Don't let a DevTools or React internal error interfere with
 logging.

---
 src/backend/console.js | 60 ++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/backend/console.js b/src/backend/console.js
index 1b89ce782d..22f5db9515 100644
--- a/src/backend/console.js
+++ b/src/backend/console.js
@@ -83,40 +83,44 @@ export function patch(): void {
         targetConsole[method]);
 
       const overrideMethod = (...args) => {
-        // If we are ever called with a string that already has a component stack, e.g. a React error/warning,
-        // don't append a second stack.
-        const alreadyHasComponentStack =
-          args.length > 0 && FRAME_REGEX.exec(args[args.length - 1]);
+        try {
+          // If we are ever called with a string that already has a component stack, e.g. a React error/warning,
+          // don't append a second stack.
+          const alreadyHasComponentStack =
+            args.length > 0 && FRAME_REGEX.exec(args[args.length - 1]);
 
-        if (!alreadyHasComponentStack) {
-          // If there's a component stack for at least one of the injected renderers, append it.
-          // We don't handle the edge case of stacks for more than one (e.g. interleaved renderers?)
-          for (let {
-            getCurrentFiber,
-            getDisplayNameForFiber,
-          } of injectedRenderers.values()) {
-            let current: ?Fiber = getCurrentFiber();
-            let ownerStack: string = '';
-            while (current != null) {
-              const name = getDisplayNameForFiber(current);
-              const owner = current._debugOwner;
-              const ownerName =
-                owner != null ? getDisplayNameForFiber(owner) : null;
+          if (!alreadyHasComponentStack) {
+            // If there's a component stack for at least one of the injected renderers, append it.
+            // We don't handle the edge case of stacks for more than one (e.g. interleaved renderers?)
+            for (let {
+              getCurrentFiber,
+              getDisplayNameForFiber,
+            } of injectedRenderers.values()) {
+              let current: ?Fiber = getCurrentFiber();
+              let ownerStack: string = '';
+              while (current != null) {
+                const name = getDisplayNameForFiber(current);
+                const owner = current._debugOwner;
+                const ownerName =
+                  owner != null ? getDisplayNameForFiber(owner) : null;
 
-              ownerStack += describeComponentFrame(
-                name,
-                current._debugSource,
-                ownerName
-              );
+                ownerStack += describeComponentFrame(
+                  name,
+                  current._debugSource,
+                  ownerName
+                );
 
-              current = owner;
-            }
+                current = owner;
+              }
 
-            if (ownerStack !== '') {
-              args.push(ownerStack);
-              break;
+              if (ownerStack !== '') {
+                args.push(ownerStack);
+                break;
+              }
             }
           }
+        } catch (error) {
+          // Don't let a DevTools or React internal error interfere with logging.
         }
 
         originalMethod(...args);