From 3216beb062707fd8a078ae5991fb17831399865b Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 7 Sep 2009 08:59:27 +0200 Subject: mkswap: fix memory leaks, cleanup check_blocks() Signed-off-by: Karel Zak --- disk-utils/mkswap.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'disk-utils/mkswap.c') diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index bdfa8f7a9..9feb2111d 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -141,7 +141,7 @@ is_sparc64(void) { */ static int user_pagesize; static int pagesize; -static unsigned long *signature_page; +static unsigned long *signature_page = NULL; struct swap_header_v1 *p; static void @@ -169,6 +169,11 @@ init_signature_page(void) { p = (struct swap_header_v1 *) signature_page; } +static void +deinit_signature_page(void) { + free(signature_page); +} + static void write_signature(char *sig) { char *sp = (char *) signature_page; @@ -303,20 +308,18 @@ check_blocks(void) { die(_("Out of memory")); current_page = 0; while (current_page < PAGES) { - if (!check) - continue; if (do_seek && lseek(DEV,current_page*pagesize,SEEK_SET) != current_page*pagesize) die(_("seek failed in check_blocks")); - if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) { + if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) page_bad(current_page); - } current_page++; } if (badpages == 1) printf(_("one bad page\n")); else if (badpages > 1) printf(_("%lu bad pages\n"), badpages); + free(buffer); } /* return size in pages */ @@ -523,6 +526,7 @@ main(int argc, char ** argv) { #endif init_signature_page(); /* get pagesize */ + atexit(deinit_signature_page); if (!device_name) { fprintf(stderr, -- cgit v1.2.3-55-g7522