public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/commands/toolcontext.c Date: Wed, 08 Feb 2012 10:46:00 -0000 [thread overview] Message-ID: <20120208104626.18535.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2012-02-08 10:46:25 Modified files: . : WHATS_NEW lib/commands : toolcontext.c Log message: Release allocated resources in error path If composite_filter_create() fails, release filters. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.2258&r2=1.2259 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/commands/toolcontext.c.diff?cvsroot=lvm2&r1=1.148&r2=1.149 --- LVM2/WHATS_NEW 2012/02/08 10:43:42 1.2258 +++ LVM2/WHATS_NEW 2012/02/08 10:46:24 1.2259 @@ -1,5 +1,6 @@ Version 2.02.91 - =================================== + Release allocated resources in error path for composite_filter_create(). Do not use lstat() results when failed in _rm_link(). Remove a "waiting for another thread" log message from dmeventd plugins. --- LVM2/lib/commands/toolcontext.c 2012/02/01 13:42:19 1.148 +++ LVM2/lib/commands/toolcontext.c 2012/02/08 10:46:24 1.149 @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. * @@ -728,6 +728,7 @@ unsigned nr_filt = 0; const struct dm_config_node *cn; struct dev_filter *filters[MAX_FILTERS]; + struct dev_filter *composite; memset(filters, 0, sizeof(filters)); @@ -781,8 +782,16 @@ } /* Only build a composite filter if we really need it. */ - return (nr_filt == 1) ? - filters[0] : composite_filter_create(nr_filt, filters); + if (nr_filt == 1) + return filters[0]; + + if (!(composite = composite_filter_create(nr_filt, filters))) { + stack; + nr_filt++; /* compensate skip NULL */ + goto err; + } + + return composite; err: nr_filt--; /* skip NULL */ while (nr_filt-- > 0)
next reply other threads:[~2012-02-08 10:46 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-02-08 10:46 zkabelac [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-05-23 13:02 zkabelac 2012-03-23 9:42 zkabelac 2012-02-27 10:05 zkabelac 2011-07-08 16:49 agk 2011-06-28 0:23 agk 2010-11-24 9:34 zkabelac 2010-04-30 12:37 zkabelac 2009-07-21 20:00 mpatocka 2009-07-14 12:17 mbroz 2009-06-15 11:56 mbroz 2009-04-02 20:46 taka 2007-02-08 17:31 agk 2007-01-23 16:03 agk 2005-01-27 15:50 agk
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=20120208104626.18535.qmail@sourceware.org \ --to=zkabelac@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).