Fixing analyze warnings

gh-unit · Sep 27, 2012 · c954c9c · c954c9c
1 parent 8642ca7
commit c954c9c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Classes/GHTest/GHTestGroup.m b/Classes/GHTest/GHTestGroup.m
@@ -56,15 +56,15 @@ - (id)initWithName:(NSString *)name delegate:(id<GHTestDelegate>)delegate {
 }
 
 - (id)initWithTestCase:(id)testCase delegate:(id<GHTestDelegate>)delegate {
-  if ([self initWithName:NSStringFromClass([testCase class]) delegate:delegate]) {
+  if ((self = [self initWithName:NSStringFromClass([testCase class]) delegate:delegate])) {
     testCase_ = testCase;
     [self _addTestsFromTestCase:testCase];
   }
   return self;
 }
 
 - (id)initWithTestCase:(id)testCase selector:(SEL)selector delegate:(id<GHTestDelegate>)delegate {
-  if ([self initWithName:NSStringFromClass([testCase class]) delegate:delegate]) {
+  if ((self = [self initWithName:NSStringFromClass([testCase class]) delegate:delegate])) {
     testCase_ = testCase;
     [self addTest:[GHTest testWithTarget:testCase selector:selector]];
   }

diff --git a/Classes/GHViewTestCase.m b/Classes/GHViewTestCase.m
@@ -136,7 +136,9 @@ + (BOOL)compareImage:(UIImage *)image withRenderedImage:(UIImage *)renderedImage
   GHPixel *renderedImagePixels = (GHPixel *) calloc(1, image.size.width * image.size.height * sizeof(GHPixel));
 
   if (!imagePixels || !renderedImagePixels) {
-    GHUDebug(@"Unable to create pixel array for image comparieson.");
+    GHUDebug(@"Unable to create pixel array for image comparison.");
+    if (imagePixels) free(imagePixels);
+    if (renderedImagePixels) free(renderedImagePixels);
     return NO;
   }
   CGContextRef imageContext = CGBitmapContextCreate((void *)imagePixels,
@@ -159,6 +161,8 @@ + (BOOL)compareImage:(UIImage *)image withRenderedImage:(UIImage *)renderedImage
     GHUDebug(@"Unable to create image contexts for image comparison");
     CGContextRelease(imageContext);
     CGContextRelease(renderedImageContext);
+    free(imagePixels);
+    free(renderedImagePixels);
     return NO;
   }
   // Draw the image in the bitmap

diff --git a/TestImages/GHUnitIOSTestViewTest-testNoSavedImage-1-0-GHUnitIOSTestView.png b/TestImages/GHUnitIOSTestViewTest-testNoSavedImage-1-0-GHUnitIOSTestView.png
diff --git a/XcodeConfig/Shared.xcconfig b/XcodeConfig/Shared.xcconfig
@@ -1,4 +1,4 @@
-GHUNIT_VERSION = 0.5.4
+GHUNIT_VERSION = 0.5.5
 
 GHUNIT_GENERAL_OTHER_CFLAGS = -Wdiv-by-zero -Wbad-function-cast -Wnested-externs -Wold-style-definition