Fix warnings and memory issues (TextureGroup#1003)

mikezucc · Oct 2, 2018 · c2c776b · c2c776b
1 parent 6a81202
commit c2c776b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/Source/ASCGImageBuffer.h b/Source/ASCGImageBuffer.h
@@ -25,7 +25,7 @@ AS_SUBCLASSING_RESTRICTED
 @property (readonly) void *mutableBytes NS_RETURNS_INNER_POINTER;
 
 /// Don't do any drawing or call any methods after calling this.
-- (CGDataProviderRef)createDataProviderAndInvalidate;
+- (CGDataProviderRef)createDataProviderAndInvalidate CF_RETURNS_RETAINED;
 
 @end
 

diff --git a/Source/ASRunLoopQueue.mm b/Source/ASRunLoopQueue.mm
@@ -101,7 +101,7 @@ - (void)threadMain
         return;
       }
       // The scope below is entered while already locked. @autorelease is crucial here; see PR 2890.
-      NSInteger count;
+      __unused NSInteger count; // Prevent static analyzer warning if release build
       @autoreleasepool {
 #if ASRunLoopQueueLoggingEnabled
         NSLog(@"ASDeallocQueue Processing: %lu objects destroyed", weakSelf->_queue.size());
@@ -281,7 +281,8 @@ @implementation ASAbstractRunLoopQueue
 
 - (instancetype)init
 {
-  if (self != [super init]) {
+  self = [super init];
+  if (self == nil) {
     return nil;
   }
   ASDisplayNodeAssert(self.class != [ASAbstractRunLoopQueue class], @"Should never create instances of abstract class ASAbstractRunLoopQueue.");

diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
@@ -346,7 +346,9 @@ - (void)prepareAttributedString:(NSMutableAttributedString *)attributedString
   if (_shadowOpacity > 0 && (_shadowRadius != 0 || !CGSizeEqualToSize(_shadowOffset, CGSizeZero)) && CGColorGetAlpha(_shadowColor) > 0) {
     NSShadow *shadow = [[NSShadow alloc] init];
     if (_shadowOpacity != 1) {
-      shadow.shadowColor = [UIColor colorWithCGColor:CGColorCreateCopyWithAlpha(_shadowColor, _shadowOpacity * CGColorGetAlpha(_shadowColor))];
+      CGColorRef shadowColorRef = CGColorCreateCopyWithAlpha(_shadowColor, _shadowOpacity * CGColorGetAlpha(_shadowColor));
+      shadow.shadowColor = [UIColor colorWithCGColor:shadowColorRef];
+      CGColorRelease(shadowColorRef);
     } else {
       shadow.shadowColor = [UIColor colorWithCGColor:_shadowColor];
     }

diff --git a/Source/Details/ASCollectionFlowLayoutDelegate.m b/Source/Details/ASCollectionFlowLayoutDelegate.m
@@ -60,7 +60,7 @@ - (id)additionalInfoForLayoutWithElements:(ASElementMap *)elements
 + (ASCollectionLayoutState *)calculateLayoutWithContext:(ASCollectionLayoutContext *)context
 {
   ASElementMap *elements = context.elements;
-  NSMutableArray<ASCellNode *> *children = ASArrayByFlatMapping(elements.itemElements, ASCollectionElement *element, element.node);
+  NSArray<ASCellNode *> *children = ASArrayByFlatMapping(elements.itemElements, ASCollectionElement *element, element.node);
   if (children.count == 0) {
     return [[ASCollectionLayoutState alloc] initWithContext:context];
   }

diff --git a/Source/Private/TextExperiment/Component/ASTextLayout.m b/Source/Private/TextExperiment/Component/ASTextLayout.m
@@ -1959,7 +1959,7 @@ - (NSArray *)selectionRectsForRange:(ASTextRange *)range {
   range = [self _correctedRangeWithEdge:range];
 
   BOOL isVertical = _container.verticalForm;
-  NSMutableArray *rects = [[NSMutableArray<NSValue *> alloc] init];
+  NSMutableArray *rects = [[NSMutableArray<ASTextSelectionRect *> alloc] init];
   if (!range) return rects;
 
   NSUInteger startLineIndex = [self lineIndexForPosition:range.start];