Handle invalidation error in RCTObjcExecutor

fromcelticpark · facebook-github-bot · commit 493f3e8da5a1 · 2018-01-18T15:23:03.000-08:00
Differential Revision: D6748200

fbshipit-source-id: eb98782c2ba080273c1f027846984f5f4caddf26
diff --git a/React/CxxBridge/RCTObjcExecutor.mm b/React/CxxBridge/RCTObjcExecutor.mm
@@ -45,7 +45,10 @@
   {
     m_jsCallback = ^(id json, NSError *error) {
       if (error) {
-        m_errorBlock(error);
+        // Do not use "m_errorBlock" here as the bridge might be in the middle
+        // of invalidation as a result of error handling and "this" can be
+        // already deallocated.
+        errorBlock(error);
         return;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,10 @@`
`45`	`45`	`{`
`46`	`46`	`m_jsCallback = ^(id json, NSError *error) {`
`47`	`47`	`if (error) {`
`48`		`- m_errorBlock(error);`
	`48`	`+ // Do not use "m_errorBlock" here as the bridge might be in the middle`
	`49`	`+ // of invalidation as a result of error handling and "this" can be`
	`50`	`+ // already deallocated.`
	`51`	`+ errorBlock(error);`
`49`	`52`	`return;`
`50`	`53`	`}`
`51`	`54`