Fix analyzer warnings

Author: gnachman

SignedArchive/SignedArchive/SIGArchiveChunk.h

@@ -29,9 +29,9 @@ extern NSString *const SIGArchiveHeaderMagicString;
 @property (nonatomic, readonly) long long payloadOffset;
 @property (nullable, nonatomic, readonly) NSFileHandle *fileHandle;
 
-+ (instancetype)chunkFromFileHandle:(NSFileHandle *)fileHandle
-                           atOffset:(long long)offset
-                              error:(out NSError **)error;
++ (instancetype _Nullable)chunkFromFileHandle:(NSFileHandle *)fileHandle
+                                     atOffset:(long long)offset
+                                        error:(out NSError **)error;
 
 - (instancetype)initWithTag:(SIGArchiveTag)tag
                      length:(long long)length

ThirdParty/PSMTabBarControl/source/PSMOverflowPopUpButton.m

@@ -42,7 +42,6 @@ - (void)drawRect:(NSRect)rect
         [super drawRect:rect];
         return;
     }
-    rect = NSIntersectionRect(rect, self.bounds);
 
     NSImage *image = (_down) ? _PSMTabBarOverflowDownPopUpImage : _PSMTabBarOverflowPopUpImage;
         NSSize imageSize = [image size];

iTerm2.xcodeproj/project.pbxproj

@@ -3064,7 +3064,6 @@
 		A6C763481B45C52B00E3C992 /* iTermShortcutInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D373E4818F3613600773D3E /* iTermShortcutInputView.m */; };
 		A6C763491B45C52B00E3C992 /* iTermTabBarControlView.m in Sources */ = {isa = PBXBuildFile; fileRef = A6C537BD1938374600A08C18 /* iTermTabBarControlView.m */; };
 		A6C7634D1B45C52B00E3C992 /* PTYNoteView.m in Sources */ = {isa = PBXBuildFile; fileRef = A63F4099183B3AA7003A6A6D /* PTYNoteView.m */; };
-		A6C7634E1B45C52B00E3C992 /* RoundedRectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D085F9D16F137D900B7FCE9 /* RoundedRectView.m */; };
 		A6C763501B45C52B00E3C992 /* SolidColorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DC38817148E840700B89F7C /* SolidColorView.m */; };
 		A6C763511B45C52B00E3C992 /* SplitSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D29732A14082A52004C5DBE /* SplitSelectionView.m */; };
 		A6C763541B45C52B00E3C992 /* iTermOpenQuicklyTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = A69B4599197319CA00F5444D /* iTermOpenQuicklyTableCellView.m */; };
@@ -4232,6 +4231,7 @@
 		A6F7A74E213CB143004DE961 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = A6F7A706213CB143004DE961 /* [email protected] */; };
 		A6F7F8072763F47B005E433E /* VT100ScreenState.m in Sources */ = {isa = PBXBuildFile; fileRef = A6F7F8052763F47B005E433E /* VT100ScreenState.m */; };
 		A6F981CC1C13783C00EE0B80 /* iTermCPS.h in Headers */ = {isa = PBXBuildFile; fileRef = A6F981CB1C13783C00EE0B80 /* iTermCPS.h */; };
+		A6F9821F2CA775E200229070 /* RoundedRectView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D085F9D16F137D900B7FCE9 /* RoundedRectView.m */; };
 		A6F9EF3720850C41005530F7 /* iTermCompetentTableRowView.h in Headers */ = {isa = PBXBuildFile; fileRef = A6F9EF3520850C41005530F7 /* iTermCompetentTableRowView.h */; };
 		A6F9EF3820850C41005530F7 /* iTermCompetentTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = A6F9EF3620850C41005530F7 /* iTermCompetentTableRowView.m */; };
 		A6FB633123DE7DEC00026D52 /* SearchableComboListView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6FB633023DE7DEB00026D52 /* SearchableComboListView.framework */; };
@@ -15926,6 +15926,7 @@
 				A631FC8E20EDDAEA00EB824F /* iTermSearchFieldCell.m in Sources */,
 				A67F5DE723947A2700D18028 /* iTermMultiServerConnection.m in Sources */,
 				A623D9551F8B04890011F8C3 /* iTermMetalGlue.m in Sources */,
+				A6F9821F2CA775E200229070 /* RoundedRectView.m in Sources */,
 				53E9DFE4220D52EF0070C9C0 /* SendTextTrigger.m in Sources */,
 				A67960D01F81FCBB008A42BC /* iTermBackgroundColorRenderer.mm in Sources */,
 				A6DBC0391FF9B30000F1466D /* iTermTexturePool.m in Sources */,
@@ -16599,7 +16600,6 @@
 				1D6578431CA5E90900358E62 /* PSMDarkHighContrastTabStyle.m in Sources */,
 				A6C762CB1B45C52B00E3C992 /* iTermController.m in Sources */,
 				A6C763BC1B45C52B00E3C992 /* iTermTipData.m in Sources */,
-				A6C7634E1B45C52B00E3C992 /* RoundedRectView.m in Sources */,
 				A6C763B21B45C52B00E3C992 /* MarkTrigger.m in Sources */,
 				A6C7632D1B45C52B00E3C992 /* ThreeFingerTapGestureRecognizer.m in Sources */,
 				A6C763861B45C52B00E3C992 /* iTermProfilesPanel.m in Sources */,

pidinfo/pidinfo.m

@@ -605,8 +605,12 @@ - (void)requestGitStateForPath:(NSString *)path
         NSPipe *pipe = [NSPipe pipe];
 
         NSTask *task = [[NSTask alloc] init];
-        task.launchPath = [NSString stringWithCString:GetPathToSelf()
+        const char *pathToSelf = GetPathToSelf();
+        task.launchPath = [NSString stringWithCString:pathToSelf
                                              encoding:NSUTF8StringEncoding];
+        if (pathToSelf) {
+            free((void *)pathToSelf);
+        }
         task.arguments = @[ @"--git-state", path, [@(timeout) stringValue] ];
         task.standardOutput = pipe;
         @try {

sources/AtomicHelpers.m

@@ -7,6 +7,7 @@
 
 #import "AtomicHelpers.h"
 
+#import "iTermMalloc.h"
 #include <stdatomic.h>
 #include <stdlib.h>
 
@@ -15,10 +16,8 @@
 } iTermAtomicInt64;
 
 iTermAtomicInt64 *iTermAtomicInt64Create(void) {
-    iTermAtomicInt64 *ai = malloc(sizeof(iTermAtomicInt64));
-    if (ai != NULL) {
-        atomic_init(&ai->value, 0);
-    }
+    iTermAtomicInt64 *ai = iTermMalloc(sizeof(iTermAtomicInt64));
+    atomic_init(&ai->value, 0);
     return ai;
 }
 

sources/ColorsMenuItemView.m

@@ -187,7 +187,6 @@ - (NSColor *)outlineColorAtIndex:(NSInteger)i enabled:(BOOL)enabled {
 
 // Draw the menu item (label and colors)
 - (void)drawRect:(NSRect)rect {
-    rect = NSIntersectionRect(rect, self.bounds);
     const BOOL enabled = self.enabled;
 
     // draw the "x" (reset color to default)

sources/ComposerTextView.swift

@@ -969,7 +969,7 @@ extension NSRange {
 }
 
 
-extension NSEvent.ModifierFlags: Hashable {
+extension NSEvent.ModifierFlags: @retroactive Hashable {
 
 }
 

sources/FindView.m

@@ -51,7 +51,6 @@ - (NSString *)description {
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
-    dirtyRect = NSIntersectionRect(dirtyRect, self.bounds);
     NSRect frame = [self frame];
     [[NSGraphicsContext currentContext] saveGraphicsState];
     [[NSGraphicsContext currentContext] setShouldAntialias:YES];

sources/LineBlock+SwiftInterop.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface LineBlock(SwiftInterop)
 
-- (NSData *)decompressedDataFromV4Data:(NSData *)v4data;
+- (NSData * _Nullable)decompressedDataFromV4Data:(NSData *)v4data;
 
 @end
 

sources/LineBlockMetadataArray.h

@@ -27,7 +27,7 @@ typedef struct {
 
 typedef struct {
     LineBlockMetadata *metadata;
-    NSMutableIndexSet *mutableDoubleWidthCharacters;
+    NSMutableIndexSet * _Nullable mutableDoubleWidthCharacters;
 } LineBlockMutableMetadata;
 
 // Don't access this directly. Use the functions below.

sources/NSObject+iTerm.h

@@ -115,7 +115,7 @@ NS_INLINE NSUInteger iTermCombineHash(NSUInteger hash1, NSUInteger hash2) {
 - (id)it_jsonSafeValue;
 
 - (NSData *)it_keyValueCodedData;
-+ (instancetype)it_fromKeyValueCodedData:(NSData *)data;
++ (instancetype _Nullable)it_fromKeyValueCodedData:(NSData *)data;
 - (NSString *)jsonEncoded;
 + (instancetype)fromJsonEncodedString:(NSString *)string;
 

sources/NSScreen+iTerm.h

@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (BOOL)it_stringLooksLikeUniqueKey:(NSString *)string;
 + (double)fractionOfFrameOnAnyScreen:(NSRect)frame
                    recommendedOrigin:(NSPoint *)recommendedOriginPtr;
-+ (NSScreen *)screenContainingCoordinate:(NSPoint)point;
++ (NSScreen * _Nullable)screenContainingCoordinate:(NSPoint)point;
 
 // Returns the visible frame modified to not include the 4 pixel boundary given to a hidden dock.
 // Kind of a gross hack since the magic 4 pixel number could change in the future.

sources/PTYMouseHandler.h

@@ -122,7 +122,7 @@ dragSemanticHistoryWithEvent:(NSEvent *)event
                             state:(iTermMouseState)state;
 - (BOOL)mouseHandlerAnyReportingModeEnabled:(PTYMouseHandler *)mouseHandler;
 - (void)mouseHandlerRedraw:(PTYMouseHandler *)mouseHandler;
-- (NSString *)mouseHandler:(PTYMouseHandler *)mouseHandler blockIDOnLine:(int)line;
+- (NSString * _Nullable)mouseHandler:(PTYMouseHandler *)mouseHandler blockIDOnLine:(int)line;
 - (BOOL)mouseHandlerMouseDownAt:(NSPoint)locationInWindow;
 - (BOOL)mouseHandlerMouseUp:(NSEvent *)event;
 - (void)mouseHandler:(PTYMouseHandler *)sender handleCommandShiftClickAtCoord:(VT100GridCoord)coord;

sources/PTYNoteView.m

@@ -311,7 +311,6 @@ - (NSBezierPath *)roundedRectangleWithPointerInRect:(NSRect)frame
 - (void)drawRect:(NSRect)dirtyRect
 {
     [super drawRect:dirtyRect];
-    dirtyRect = NSIntersectionRect(dirtyRect, self.bounds);
 
     NSBezierPath *path = [self roundedRectangleWithPointerInRect:self.bounds
                                                            inset:kInset

sources/PTYSession+ARC.h

@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
                       metadata:(iTermImmutableMetadata)metadata
           lineBufferGeneration:(long long)lineBufferGeneration;
 - (void)maybeTurnOffPasteBracketing;
-- (id<iTermPopupWindowHosting>)popupHost;
+- (id<iTermPopupWindowHosting> _Nullable)popupHost;
 
 @end
 

sources/PTYSession.m

@@ -7943,6 +7943,7 @@ - (NSString *)regularExpressonForNonLowPrecisionSmartSelectionRulesCombined {
         NSError *error = nil;
         NSRegularExpression *expr = [[NSRegularExpression alloc] initWithPattern:bare options:0 error:&error];
         if (error || !expr) {
+            [expr release];
             return nil;
         }
         [expr release];
@@ -15886,7 +15887,7 @@ - (NSString *)requestNaturalLanguageQuery {
     const NSInteger button = [alert runSheetModalForWindow:self.view.window];
 
     if (button == NSAlertFirstButtonReturn) {
-        return [[input string] copy];
+        return [[[input string] copy] autorelease];
     } else if (button == NSAlertSecondButtonReturn) {
         return nil;
     }
@@ -18166,7 +18167,7 @@ - (void)composerManager:(iTermComposerManager *)composerManager enqueueCommand:(
         return;
     }
     // Send when next mark is received.
-    [_commandQueue addObject:[command copy]];
+    [_commandQueue addObject:[[command copy] autorelease]];
 }
 
 - (void)composerManager:(iTermComposerManager *)composerManager sendCommand:(NSString *)command {

sources/PTYTextView+ARC.h

@@ -63,11 +63,11 @@ iTermURLActionHelperDelegate>
 
 #pragma mark - Context Menu
 
-- (NSMenu *)menuForEvent:(NSEvent *)event;
+- (NSMenu * _Nullable)menuForEvent:(NSEvent *)event;
 
 #pragma mark - Offscreen Command Line
 
-- (iTermOffscreenCommandLine *)offscreenCommandLineForClickAt:(NSPoint)windowPoint;
+- (iTermOffscreenCommandLine * _Nullable)offscreenCommandLineForClickAt:(NSPoint)windowPoint;
 - (void)presentCommandInfoForOffscreenCommandLine:(iTermOffscreenCommandLine *)offscreenCommandLine
                                             event:(NSEvent *)event
                          fromOffscreenCommandLine:(BOOL)fromOffscreenCommandLine;
@@ -127,7 +127,7 @@ iTermURLActionHelperDelegate>
 - (BOOL)selectionIsBig:(iTermSelection *)selection;
 
 // Saves the selection as the "last" selection app-wide and returns a promise in case you need the value.
-- (iTermPromise<NSString *> *)recordSelection:(iTermSelection *)selection;
+- (iTermPromise<NSString *> * _Nullable)recordSelection:(iTermSelection *)selection;
 
 - (id)selectedTextWithStyle:(iTermCopyTextStyle)style
                cappedAtSize:(int)maxBytes

sources/PTYTextView.m

@@ -1001,13 +1001,6 @@ - (void)invalidateInputMethodEditorRect {
     if ([_dataSource width] == 0) {
         return;
     }
-    int imeLines = ([_dataSource cursorX] - 1 + [self inputMethodEditorLength] + 1) / [_dataSource width] + 1;
-
-    NSRect imeRect = NSMakeRect([iTermPreferences intForKey:kPreferenceKeySideMargins],
-                                ([_dataSource cursorY] - 1 + [_dataSource numberOfLines] - [_dataSource height]) * _lineHeight,
-                                [_dataSource width] * _charWidth,
-                                imeLines * _lineHeight);
-    imeRect = [self rectWithHalo:imeRect];
     [self requestDelegateRedraw];
 }
 
@@ -5243,10 +5236,10 @@ - (VT100GridAbsCoord)absCoordForButton:(iTermTerminalButton *)button API_AVAILAB
         }];
         if (i == NSNotFound || !VT100GridAbsCoordEquals([self absCoordForButton:_buttons[i]], place.coord)) {
             if (place.mark.copyBlockID) {
-                iTermTerminalButton *button = [[iTermTerminalCopyButton alloc] initWithID:place.id 
-                                                                                  blockID:place.mark.copyBlockID
-                                                                                     mark:place.mark
-                                                                                     absY:nil];
+                iTermTerminalButton *button = [[[iTermTerminalCopyButton alloc] initWithID:place.id
+                                                                                   blockID:place.mark.copyBlockID
+                                                                                      mark:place.mark
+                                                                                      absY:nil] autorelease];
                 NSString *blockID = [[place.mark.copyBlockID copy] autorelease];
 
                 button.action = ^(NSPoint locationInWindow) {

sources/PTYTriggerEvaluator.h

@@ -20,8 +20,8 @@ NS_ASSUME_NONNULL_BEGIN
 extern NSString *const PTYSessionSlownessEventExecute;
 
 @protocol PTYTriggerEvaluatorDataSource<iTermTextDataSource>
-- (iTermStringLine *)stringLineAsStringAtAbsoluteLineNumber:(long long)absoluteLineNumber
-                                                   startPtr:(long long *)startAbsLineNumber;
+- (iTermStringLine * _Nullable)stringLineAsStringAtAbsoluteLineNumber:(long long)absoluteLineNumber
+                                                             startPtr:(long long *)startAbsLineNumber;
 - (int)numberOfScrollbackLines;
 - (int)cursorY;
 - (long long)totalScrollbackOverflow;
@@ -74,7 +74,7 @@ extern NSString *const PTYSessionSlownessEventExecute;
 - (void)checkIdempotentTriggersIfAllowed;
 - (void)invalidateIdempotentTriggers;
 - (void)appendStringToTriggerLine:(NSString *)s;
-- (NSString *)appendAsciiDataToCurrentLine:(AsciiData *)asciiData;
+- (NSString * _Nullable)appendAsciiDataToCurrentLine:(AsciiData *)asciiData;
 - (void)forceCheck;
 - (NSIndexSet *)enabledTriggerIndexes;
 - (void)clearTriggerLine;

sources/ProfileListView.m

@@ -296,7 +296,7 @@ - (BOOL)searchFieldHasText
 #pragma mark -  Drag drop
 
 - (id<NSPasteboardWriting>)tableView:(NSTableView *)tableView pasteboardWriterForRow:(NSInteger)row {
-    NSPasteboardItem *pbItem = [[NSPasteboardItem alloc] init];
+    NSPasteboardItem *pbItem = [[[NSPasteboardItem alloc] init] autorelease];
     [pbItem setData:[self dataForRow:row]
             forType:kProfileTableViewDataType];
     return pbItem;

sources/PseudoTerminal+WindowStyle.h

@@ -34,7 +34,7 @@ iTermWindowType iTermWindowTypeNormalized(iTermWindowType windowType);
 - (void)toggleTraditionalFullScreenModeImpl;
 - (BOOL)fullScreenImpl;
 - (iTermWindowType)windowTypeImpl;
-- (IBAction)toggleFullScreenModeImpl:(id)sender;
+- (IBAction)toggleFullScreenModeImpl:(id _Nullable)sender;
 - (void)toggleFullScreenModeImpl:(id)sender
                       completion:(void (^)(BOOL))completion;
 - (BOOL)togglingLionFullScreenImpl;

sources/PseudoTerminal.m

@@ -2251,7 +2251,7 @@ - (IBAction)duplicateSession:(id)sender {
     PTYSession *session = self.currentSession;
     MutableProfile *profile = [[session.profile mutableCopy] autorelease];
     NSArray<iTermSSHReconnectionInfo *> *pendingJumps = nil;
-    Profile *original = [profile copy];
+    Profile *original = [[profile copy] autorelease];
     if (session.sshIdentity) {
         NSArray<iTermSSHReconnectionInfo *> *sequence = session.sshCommandLineSequence;
         if ([profile[KEY_CUSTOM_COMMAND] isEqualToString:kProfilePreferenceCommandTypeSSHValue]) {
@@ -2293,7 +2293,7 @@ - (IBAction)duplicateSession:(id)sender {
     DLog(@"Will use profile:\n%@", profile);
     NSMutableDictionary *dict = [NSMutableDictionary dictionary];
     iTermMutableDictionaryEncoderAdapter *encoder =
-        [[iTermMutableDictionaryEncoderAdapter alloc] initWithMutableDictionary:dict];
+        [[[iTermMutableDictionaryEncoderAdapter alloc] initWithMutableDictionary:dict] autorelease];
     [session encodeArrangementWithContents:YES encoder:encoder];
 
     NSDictionary *tabArrangement = [self.currentTab arrangementWithOnlySession:session

sources/TransferrableFileMenuItemView.m

@@ -81,7 +81,6 @@ - (void)sanityCheckSiblings
 
 - (void)drawRect:(NSRect)dirtyRect {
      [super drawRect:dirtyRect];
-    dirtyRect = NSIntersectionRect(dirtyRect, self.bounds);
     NSColor *textColor;
     NSColor *grayColor;
 

sources/VT100DCSParser.h

@@ -78,7 +78,7 @@ typedef NS_ENUM(NSInteger, VT100DCSState) {
 @property(nonatomic, readonly) NSString *hookDescription;
 
 // Uniquely identifies this object so the main thread can avoid unhooking the wrong session.
-@property(nonatomic, readonly) NSString *uniqueID;
+@property(nonatomic, readonly, nullable) NSString *uniqueID;
 
 - (void)decodeFromContext:(iTermParserContext *)context
                     token:(VT100Token *)result

sources/VT100GridTypes.h

@@ -686,12 +686,12 @@ NS_INLINE BOOL VT100GridCoordFromDictionary(NSDictionary * _Nullable dict, VT100
     }
 
     NSNumber *x = [NSNumber castFrom:dict[@"x"]];
-    if (!x) {
+    if (x != nil) {
         return NO;
     }
 
     NSNumber *y = [NSNumber castFrom:dict[@"y"]];
-    if (!y) {
+    if (y != nil) {
         return NO;
     }
 

sources/VT100ScreenMutableState.h

@@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (atomic, weak) id<VT100ScreenSideEffectPerforming> sideEffectPerformer;
 @property (nonatomic, readonly) iTermTokenExecutor *tokenExecutor;
 @property (nonatomic) BOOL exited;
-@property (nonatomic, strong, readonly) VT100Terminal *terminal;
+@property (nonatomic, strong, readonly, nullable) VT100Terminal *terminal;
 @property (nonatomic, strong) iTermEchoProbe *echoProbe;
 @property (nonatomic, weak) id<iTermEchoProbeDelegate> echoProbeDelegate;
 @property (nullable, nonatomic, strong) VT100ScreenState *mainThreadCopy;
@@ -106,7 +106,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)appendStringAtCursor:(NSString *)string;
 - (void)appendScreenCharArrayAtCursor:(const screen_char_t *)buffer
                                length:(int)len
-               externalAttributeIndex:(id<iTermExternalAttributeIndexReading>)externalAttributes;
+               externalAttributeIndex:(id<iTermExternalAttributeIndexReading> _Nullable)externalAttributes;
 - (void)appendTabAtCursor:(BOOL)setBackgroundColors;
 - (void)appendScreenChars:(const screen_char_t *)line
                       length:(int)length
@@ -220,9 +220,9 @@ void VT100ScreenEraseCell(screen_char_t *sct,
 
 // This is like setPromptStartLine: but with lots of side effects that are desirable for the
 // regular shell integration flow.
-- (VT100ScreenMark *)promptDidStartAt:(VT100GridAbsCoord)coord wasInCommand:(BOOL)wasInCommand detectedByTrigger:(BOOL)detectedByTrigger;
+- (VT100ScreenMark * _Nullable)promptDidStartAt:(VT100GridAbsCoord)coord wasInCommand:(BOOL)wasInCommand detectedByTrigger:(BOOL)detectedByTrigger;
 
-- (VT100ScreenMark *)setPromptStartLine:(int)line detectedByTrigger:(BOOL)detectedByTrigger;
+- (VT100ScreenMark * _Nullable)setPromptStartLine:(int)line detectedByTrigger:(BOOL)detectedByTrigger;
 - (void)didUpdatePromptLocation;
 - (void)incrementClearCountForCommandMark:(id<VT100ScreenMarkReading>)screenMarkDoppelganger;
 
@@ -273,7 +273,7 @@ void VT100ScreenEraseCell(screen_char_t *sct,
 
 - (void)removeAnnotation:(id<PTYAnnotationReading>)annotation;
 
-- (id<PTYAnnotationReading>)addNoteWithText:(NSString *)text inAbsoluteRange:(VT100GridAbsCoordRange)absRange;
+- (id<PTYAnnotationReading> _Nullable)addNoteWithText:(NSString *)text inAbsoluteRange:(VT100GridAbsCoordRange)absRange;
 
 - (void)addAnnotation:(id<PTYAnnotationReading>)annotation
               inRange:(VT100GridCoordRange)range

sources/VT100ScreenMutableState.m

@@ -1708,7 +1708,7 @@ - (void)clearForComposer {
     if (self.terminal.softAlternateScreenMode) {
         return;
     }
-    if (self.config.desiredComposerRows <= 0) {
+    if (self.config.desiredComposerRows.intValue <= 0) {
         return;
     }
     id<VT100ScreenMarkReading> mark = [self lastPromptMark];
@@ -5660,7 +5660,7 @@ - (void)inlineImageSetMarkOnScreenLine:(NSInteger)line
                          self.numberOfScrollbackLines +
                          line);
     iTermImageMark *mark = [[iTermImageMark alloc] initWithImageCode:@(code)];
-    mark = (iTermImageMark *)[self addMark:mark onLine:absLine singleLine:YES];
+    [self addMark:mark onLine:absLine singleLine:YES];
     [self setNeedsRedraw];
 }