[Frugalware-git] pacman-g2: Fix some memleak in trans.c

[Miklos Vajna]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=906a8a82dee205a033a22bbb2f59d6a413770dfc

commit 906a8a82dee205a033a22bbb2f59d6a413770dfc
Author: Laszlo Papp <djsza...@gmail.com>
Date:   Sun Oct 25 03:21:08 2009 +0100

Fix some memleak in trans.c

Fix the next memleaks that cppcheck utility showed

[./trans.c:313]: (error) Memory leak: addstr
[./trans.c:313]: (error) Memory leak: upgstr
[./trans.c:313]: (error) Memory leak: removestr
[./trans.c:313]: (error) Memory leak: conflictstr
[./trans.c:313]: (error) Memory leak: interconflictstr

diff --git a/src/pacman-g2/trans.c b/src/pacman-g2/trans.c
index 8e0be3b..6b7cc56 100644
--- a/src/pacman-g2/trans.c
+++ b/src/pacman-g2/trans.c
@@ -304,13 +304,13 @@ void cb_trans_progress(unsigned char event, char 
*pkgname, int percent, int coun
interconflictstr = strdup(_("looking for inter-conflicts"));

if(config->noprogressbar) {
-               return;
+               goto cleanup;
}

if (!pkgname)
-               return;
+               goto cleanup;
if ((percent > 100) || (percent < 0) || (percent == prevpercent))
-               return;
+               goto cleanup;

prevpercent=percent;
switch (event) {
@@ -378,9 +378,14 @@ void cb_trans_progress(unsigned char event, char *pkgname, 
int percent, int coun
PM_TRANS_PROGRESS_UPGRADE_START) && remaining != count) {
MSG(NL, "");
}
+
+cleanup:
+
FREE(addstr);
FREE(upgstr);
FREE(removestr);
+       FREE(conflictstr);
+       FREE(interconflictstr);
}

/* vim: set ts=2 sw=2 noet: */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git