Ensure context is non-null

DulMephistos · Jan 28, 2016 · 7b002c4 · 7b002c4
1 parent 4815066
commit 7b002c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/AsyncDisplayKit/ASImageNode.mm b/AsyncDisplayKit/ASImageNode.mm
@@ -238,7 +238,7 @@ - (UIImage *)displayWithParameters:(_ASImageNodeDrawParameters *)parameters isCa
   }
 
   CGContextRef context = UIGraphicsGetCurrentContext();
-  if (preContextBlock) {
+  if (context && preContextBlock) {
     preContextBlock(context);
   }
 
@@ -258,7 +258,7 @@ - (UIImage *)displayWithParameters:(_ASImageNodeDrawParameters *)parameters isCa
     [image drawInRect:imageDrawRect];
   }
 
-  if (postContextBlock) {
+  if (context && postContextBlock) {
     postContextBlock(context);
   }
 

diff --git a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm
@@ -274,7 +274,7 @@ - (asyncdisplaykit_async_transaction_operation_block_t)_displayBlockWithAsynchro
       }
 
       CGContextRef currentContext = UIGraphicsGetCurrentContext();
-      if (_willDisplayNodeContentWithRenderingContext) {
+      if (currentContext && _willDisplayNodeContentWithRenderingContext) {
         _willDisplayNodeContentWithRenderingContext(currentContext);
       }
 
@@ -284,7 +284,7 @@ - (asyncdisplaykit_async_transaction_operation_block_t)_displayBlockWithAsynchro
         [[self class] drawRect:bounds withParameters:drawParameters isCancelled:isCancelledBlock isRasterizing:rasterizing];
       }
 
-      if (_didDisplayNodeContentWithRenderingContext) {
+      if (currentContext && _didDisplayNodeContentWithRenderingContext) {
         _didDisplayNodeContentWithRenderingContext(currentContext);
       }