util-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 13/14] more: remove few memory leaks
Date: Mon,  8 Oct 2012 08:08:19 +0100	[thread overview]
Message-ID: <1349680100-18120-14-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1349680100-18120-1-git-send-email-kerolasa@iki.fi>

The remaining memory leaks are related to ncurses internals, or the one
open file descriptor when user users 'q' to exit.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 text-utils/more.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/text-utils/more.c b/text-utils/more.c
index 2ecb218..163f016 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -432,6 +432,7 @@ int main(int argc, char **argv)
 				}
 			}
 			if (srchopt) {
+				free(previousre);
 				previousre = xstrdup(initbuf);
 				search(initbuf, stdin, 1);
 				if (noscroll)
@@ -454,6 +455,7 @@ int main(int argc, char **argv)
 			if (firstf) {
 				firstf = 0;
 				if (srchopt) {
+					free(previousre);
 					previousre = xstrdup(initbuf);
 					search(initbuf, f, 1);
 					if (noscroll)
@@ -509,6 +511,7 @@ int main(int argc, char **argv)
 	}
 	free(previousre);
 	free(initbuf);
+	free(Line);
 	reset_tty();
 	exit(EXIT_SUCCESS);
 }
@@ -766,6 +769,8 @@ void __attribute__((__noreturn__)) end_it(int dummy __attribute__((__unused__)))
 		fflush(stdout);
 	} else
 		putcerr('\n');
+	free(previousre);
+	free(Line);
 	_exit(EXIT_SUCCESS);
 }
 
@@ -1624,6 +1629,7 @@ void search(char buf[], FILE *file, register int n)
 			}
 		}
 	}
+	regfree(&re);
 	if (feof(file)) {
 		if (!no_intty) {
 			Currline = saveln;
@@ -1632,9 +1638,9 @@ void search(char buf[], FILE *file, register int n)
 			putsout(_("\nPattern not found\n"));
 			end_it(0);
 		}
-		more_error(_("Pattern not found"));
 		free(previousre);
 		previousre = NULL;
+		more_error(_("Pattern not found"));
 	}
 }
 
-- 
1.7.12.2


  parent reply	other threads:[~2012-10-08  7:09 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-08  7:08 [PATCH 00/14] various: clean ups and fixes Sami Kerola
2012-10-08  7:08 ` [PATCH 01/14] ddate: remove from util-linux Sami Kerola
2012-10-08  9:06   ` Petr Uzel
2012-10-08  7:08 ` [PATCH 02/14] column: add --output-separator option Sami Kerola
2012-10-08  7:08 ` [PATCH 03/14] docs: fix column.1 groff syntax error Sami Kerola
2012-10-08  7:08 ` [PATCH 04/14] pg: refactor argument handing Sami Kerola
2012-10-08  7:08 ` [PATCH 05/14] pg: use libc error printing facilities Sami Kerola
2012-10-08  7:08 ` [PATCH 06/14] pg: add const qualifiers where suitable Sami Kerola
2012-10-08  7:08 ` [PATCH 07/14] pg: add noreturn function attributes Sami Kerola
2012-10-08  7:08 ` [PATCH 08/14] pg: use unistd.h STDOUT_FILENO Sami Kerola
2012-10-08  7:08 ` [PATCH 09/14] pg: do not turn off warnigns artificially Sami Kerola
2012-10-08  7:08 ` [PATCH 10/14] pg: fix coding style Sami Kerola
2012-10-08  7:08 ` [PATCH 11/14] more: " Sami Kerola
2012-10-08  7:08 ` [PATCH 12/14] more: align void in functions with prototypes, and remove void casts Sami Kerola
2012-10-08  7:08 ` Sami Kerola [this message]
2012-10-08  7:08 ` [PATCH 14/14] swapon: remove loop declaration [smatch scan] Sami Kerola

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1349680100-18120-14-git-send-email-kerolasa@iki.fi \
    --to=kerolasa@iki.fi \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).