From c0523a3bb58f88507b7216e555bb1958234b80c9 Mon Sep 17 00:00:00 2001 From: Ken Smith Date: Sat, 29 Dec 2007 04:56:07 +0000 Subject: Plug a memory leak. Once any given package (e.g. perl) was installed we would leak a saved screen for every other package we tried to install that listed perl as one of its dependencies. When installing things like gnome and kde that wound up being a LOT of leaked memory. Insta-MFC request coming so this can be tested as part of 6.3-RC2... Testing help from: kris --- usr.sbin/sysinstall/index.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'usr.sbin') diff --git a/usr.sbin/sysinstall/index.c b/usr.sbin/sysinstall/index.c index 7a9443a73da4..a55b54113dbf 100644 --- a/usr.sbin/sysinstall/index.c +++ b/usr.sbin/sysinstall/index.c @@ -687,7 +687,7 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended) int status = DITEM_SUCCESS; PkgNodePtr tmp2; IndexEntryPtr id = who->data; - WINDOW *w = savescr(); + WINDOW *w; /* * Short-circuit the package dependency checks. We're already @@ -702,6 +702,7 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended) if (id->installed == 1) return DITEM_SUCCESS; + w = savescr(); if (id && id->deps && strlen(id->deps)) { char t[2048 * 8], *cp, *cp2; @@ -744,6 +745,7 @@ index_extract(Device *dev, PkgNodePtr top, PkgNodePtr who, Boolean depended) dev->volume, id->volume); DEVICE_INIT(mediaDevice); } else { + restorescr(w); return DITEM_FAILURE; } } -- cgit v1.2.3