address review feedback

Author: dloebl

tests/ealloc.c

@@ -66,10 +66,14 @@ int main(void) {
     malloc_count = 0;
 
     pGIF = cgif_newgif(&gConfig);
-    if(pGIF == NULL) {
-      if(malloc_count >= fail_after) {
-        continue;
+    if(malloc_count >= fail_after) {
+      if(pGIF != NULL) {
+        fprintf(stderr, "expected NULL from cgif_newgif (fail_after=%d)\n", fail_after);
+        return 1;
       }
+      continue;
+    }
+    if(pGIF == NULL) {
       fputs("unexpected NULL from cgif_newgif\n", stderr);
       return 1;
     }
@@ -81,11 +85,15 @@ int main(void) {
     fConfig.pLocalPalette          = aPalette;
     fConfig.numLocalPaletteEntries = 2;
     r = cgif_addframe(pGIF, &fConfig);
-    if(r != CGIF_OK) {
-      if(r == CGIF_EALLOC && malloc_count >= fail_after) {
-        cgif_close(pGIF);
-        continue;
+    if(malloc_count >= fail_after) {
+      if(r != CGIF_EALLOC) {
+        fprintf(stderr, "expected CGIF_EALLOC from cgif_addframe (frame 1), got: %d\n", r);
+        return 1;
       }
+      cgif_close(pGIF);
+      continue;
+    }
+    if(r != CGIF_OK) {
       fprintf(stderr, "unexpected error from cgif_addframe (frame 1): %d\n", r);
       return 1;
     }
@@ -95,11 +103,15 @@ int main(void) {
     fConfig.pImageData = aImageData1;
     fConfig.genFlags   = CGIF_FRAME_GEN_USE_DIFF_WINDOW;
     r = cgif_addframe(pGIF, &fConfig);
-    if(r != CGIF_OK) {
-      if(r == CGIF_EALLOC && malloc_count >= fail_after) {
-        cgif_close(pGIF);
-        continue;
+    if(malloc_count >= fail_after) {
+      if(r != CGIF_EALLOC) {
+        fprintf(stderr, "expected CGIF_EALLOC from cgif_addframe (frame 2), got: %d\n", r);
+        return 1;
       }
+      cgif_close(pGIF);
+      continue;
+    }
+    if(r != CGIF_OK) {
       fprintf(stderr, "unexpected error from cgif_addframe (frame 2): %d\n", r);
       return 1;
     }
@@ -109,30 +121,32 @@ int main(void) {
     fConfig.pImageData = aImageData0;
     fConfig.genFlags   = CGIF_FRAME_GEN_USE_TRANSPARENCY;
     r = cgif_addframe(pGIF, &fConfig);
-    if(r != CGIF_OK) {
-      if(r == CGIF_EALLOC && malloc_count >= fail_after) {
-        cgif_close(pGIF);
-        continue;
+    if(malloc_count >= fail_after) {
+      if(r != CGIF_EALLOC) {
+        fprintf(stderr, "expected CGIF_EALLOC from cgif_addframe (frame 3), got: %d\n", r);
+        return 1;
       }
+      cgif_close(pGIF);
+      continue;
+    }
+    if(r != CGIF_OK) {
       fprintf(stderr, "unexpected error from cgif_addframe (frame 3): %d\n", r);
       return 1;
     }
 
     r = cgif_close(pGIF);
-    if(malloc_count < fail_after) {
-      // all mallocs succeeded without hitting our failure point -- done
-      if(r != CGIF_OK) {
-        fprintf(stderr, "unexpected error from cgif_close: %d\n", r);
+    if(malloc_count >= fail_after) {
+      if(r != CGIF_EALLOC) {
+        fprintf(stderr, "expected CGIF_EALLOC from cgif_close, got: %d (fail_after=%d)\n", r, fail_after);
         return 1;
       }
-      break;
+      continue;
     }
-    // our injected failure was hit during close (e.g. LZW encoding)
-    if(r != CGIF_EALLOC) {
-      fprintf(stderr, "expected CGIF_EALLOC from cgif_close, got: %d (fail_after=%d)\n", r, fail_after);
+    if(r != CGIF_OK) {
+      fprintf(stderr, "unexpected error from cgif_close: %d\n", r);
       return 1;
     }
-    continue;
+    break;
   }
 
   return 0;