From 095e63d522c5f83953a7420aea4e78b6c88dd268 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 8 Jul 2018 21:20:42 -0400 Subject: [PATCH] Fixed memory leaks in the tester and a symbol name flub in OS X's image.m. --- darwin/image.m | 2 +- test/main.c | 1 + test/page16.c | 10 +++++++++- test/test.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/darwin/image.m b/darwin/image.m index ae5be6d9..8824f3c6 100644 --- a/darwin/image.m +++ b/darwin/image.m @@ -18,7 +18,7 @@ uiImage *uiNewImage(double width, double height) return i; } -void Image(uiImage *i) +void uiFreeImage(uiImage *i) { NSValue *v; diff --git a/test/main.c b/test/main.c index c760f493..2f66826f 100644 --- a/test/main.c +++ b/test/main.c @@ -174,6 +174,7 @@ int main(int argc, char *argv[]) ; } printf("after uiMain()\n"); + freePage16(); uiUninit(); printf("after uiUninit()\n"); return 0; diff --git a/test/page16.c b/test/page16.c index c0f438f4..f28ba3c7 100644 --- a/test/page16.c +++ b/test/page16.c @@ -98,10 +98,11 @@ static void modelSetCellValue(uiTableModelHandler *mh, uiTableModel *m, int row, checkStates[row] = uiTableValueInt(val); } +static uiTableModel *m; + uiBox *makePage16(void) { uiBox *page16; - uiTableModel *m; uiTable *t; uiTableParams p; uiTableTextColumnOptionalParams tp; @@ -153,3 +154,10 @@ uiBox *makePage16(void) return page16; } + +void freePage16(void) +{ + uiFreeTableModel(m); + uiFreeImage(img[1]); + uiFreeImage(img[0]); +} diff --git a/test/test.h b/test/test.h index 224ef667..42ec9314 100644 --- a/test/test.h +++ b/test/test.h @@ -92,6 +92,7 @@ extern uiBox *makePage15(uiWindow *); // page16.c extern uiBox *makePage16(void); +extern void freePage16(void); // images.c extern void appendImageNamed(uiImage *img, const char *name);