From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 19 Mar 2008 14:53:13 +0000 (+0100)
Subject: don't leak memory in test examples
X-Git-Tag: r0-52-9~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb77be1410840925f021582e784d943e6f25657f;p=thirdparty%2Fnewt.git

don't leak memory in test examples
---

diff --git a/test.c b/test.c
index 50483ac..03ea040 100644
--- a/test.c
+++ b/test.c
@@ -138,14 +138,9 @@ int main(void) {
 	}
     } while (es.reason != NEWT_EXIT_COMPONENT || es.u.co == b2);
 
-    scaleVal = strdup(scaleVal);
-    enr2 = strdup(enr2);
-    enr3 = strdup(enr3);
-
+    numsel = 0;
     selectedList = newtListboxGetSelection(lb, &numsel);
 
-    newtFormDestroy(f);
-
     newtPopWindow();
     newtPopWindow();
     newtFinished();
@@ -154,11 +149,14 @@ int main(void) {
     printf("got string 2: %s\n", enr2);
     printf("got string 3: %s\n", enr3);
 
+    newtFormDestroy(f);
+
     printf("\nSelected listbox items (%d):\n", numsel);
     if(selectedList) {
 	for(i = 0; i < numsel; i++)
 	    printf("#%d\n", (int)(long) selectedList[i]);
     }
+    free(selectedList);
 
     return 0;
 }
diff --git a/testgrid.c b/testgrid.c
index 0d3aa85..a2aa3d2 100644
--- a/testgrid.c
+++ b/testgrid.c
@@ -10,9 +10,9 @@ int main(void) {
     newtComponent answer, f, t;
     newtGrid grid, subgrid;
     char * flowedText;
-    int textWidth, textHeight, rc;
+    int textWidth, textHeight, rc, i;
     char * menuContents[] = { "One", "Two", "Three", "Four", "Five", NULL };
-    const char * entries[10];
+    char * entries[10];
     struct newtWinEntry autoEntries[] = {
 	{ "An entry", entries + 0, 0 },
 	{ "Another entry", entries + 1, 0 },
@@ -97,6 +97,8 @@ int main(void) {
 		     "newtWinEntries() call. It lets you get a lot of input "
 		     "quite easily.", 50, 5, 5, 20, autoEntries, "Ok", 
 		     "Cancel", NULL);
+    for (i = 0; i < sizeof (autoEntries) / sizeof (struct newtWinEntry) && autoEntries[i].value; i++)
+	    free(*(autoEntries[i].value));
 
     newtFinished();