diff options
| -rw-r--r-- | tests/gdimagecolorclosest/gdimagecolorclosest.c | 18 | ||||
| -rw-r--r-- | tests/gdimagecolorexact/gdimagecolorexact.c | 3 | ||||
| -rw-r--r-- | tests/tiff/tiff_invalid_read.c | 28 |
3 files changed, 37 insertions, 12 deletions
diff --git a/tests/gdimagecolorclosest/gdimagecolorclosest.c b/tests/gdimagecolorclosest/gdimagecolorclosest.c index 4754a2c..f6fd742 100644 --- a/tests/gdimagecolorclosest/gdimagecolorclosest.c +++ b/tests/gdimagecolorclosest/gdimagecolorclosest.c @@ -26,7 +26,13 @@ int main() im = gdImageCreate(5, 5); c = gdImageColorAllocate(im, 255, 0, 255); c = gdImageColorClosest(im, 255, 0, 255); - c = gdTrueColorAlpha(gdImageRed(im, c), gdImageGreen(im, c), gdImageBlue(im, c), 0); + c = gdTestAssert(c>=0) ? + gdTrueColorAlpha(gdImageRed(im, c), gdImageGreen(im, c), gdImageBlue(im, c), 0) + : + -1; + + + gdImageDestroy(im); if (gdTestAssert(c==0xFF00FF) != 1) { error = -1; @@ -38,7 +44,10 @@ int main() c = gdImageColorAllocate(im, 255, 0, 0); } c = gdImageColorClosest(im, 255, 0, 0); - c = gdTrueColorAlpha(gdImageRed(im, c), gdImageGreen(im, c), gdImageBlue(im, c), 0); + c = gdTestAssert(c>=0) ? + gdTrueColorAlpha(gdImageRed(im, c), gdImageGreen(im, c), gdImageBlue(im, c), 0) + : + -1; gdImageDestroy(im); if (gdTestAssert(c==0xFF0000) != 1) { error = -1; @@ -49,7 +58,10 @@ int main() c = gdImageColorAllocate(im, 255, 0, 0); } c = gdImageColorClosest(im, 255, 0, 0); - c = gdTrueColorAlpha(gdImageRed(im, c), gdImageGreen(im, c), gdImageBlue(im, c), 0); + c = gdTestAssert(c>=0) ? + gdTrueColorAlpha(gdImageRed(im, c), gdImageGreen(im, c), gdImageBlue(im, c), 0) + : + -1; gdImageDestroy(im); if (gdTestAssert(c==0xFF0000) != 1) { error = -1; diff --git a/tests/gdimagecolorexact/gdimagecolorexact.c b/tests/gdimagecolorexact/gdimagecolorexact.c index 54698df..055127b 100644 --- a/tests/gdimagecolorexact/gdimagecolorexact.c +++ b/tests/gdimagecolorexact/gdimagecolorexact.c @@ -36,8 +36,8 @@ int main() if (gdTestAssert(color == 0xFF00FF) != 1) { error = -1; } - } + } if (gdTestAssert(c2 == 1)) { color = gdTrueColorAlpha(gdImageRed(im, c2), gdImageGreen(im, c2), gdImageBlue(im, c2), 0); @@ -56,6 +56,7 @@ int main() error = -1; } + gdImageDestroy(im); return error; diff --git a/tests/tiff/tiff_invalid_read.c b/tests/tiff/tiff_invalid_read.c index 0d12918..3c87bcf 100644 --- a/tests/tiff/tiff_invalid_read.c +++ b/tests/tiff/tiff_invalid_read.c @@ -41,23 +41,35 @@ static size_t read_test_file(char **buffer, char *basename) { char *filename; FILE *fp; - size_t exp_size, act_size = -1; + + size_t exp_size = 0, act_size = -1; filename = gdTestFilePath2("tiff", basename); fp = fopen(filename, "rb"); - if (gdTestAssert(fp != NULL)) goto fail3; + if (!gdTestAssert(fp != NULL)) goto fail3; - if (fseek(fp, 0, SEEK_END) != 0) goto fail2; + if (fseek(fp, 0, SEEK_END) != 0) { + gdTestAssert(1==0); // only increase num failures used as return values in main + goto fail2; + } exp_size = ftell(fp); - if (gdTestAssert(exp_size <= 0)) goto fail2; + if (!gdTestAssert(exp_size > 0)) { + gdTestAssert(1==0); // only increase num failures used as return values in main + goto fail2; + } - if (fseek(fp, 0, SEEK_SET) != 0) goto fail2; + if (fseek(fp, 0, SEEK_SET) != 0) { + gdTestAssert(1==0); // only increase num failures used as return values in main + goto fail2; + } *buffer = malloc(exp_size); - if (gdTestAssert(*buffer != NULL)) goto fail2; - act_size = fread(*buffer, sizeof(**buffer), exp_size, fp); - gdTestAssert(act_size == exp_size); + if (gdTestAssert(*buffer != NULL)) { + act_size = fread(*buffer, sizeof(**buffer), exp_size, fp); + gdTestAssert(act_size == exp_size); + } + fail2: fclose(fp); |