From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3668-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 29480 invoked by alias); 23 Nov 2010 15:09:02 -0000
Received: (qmail 29447 invoked by uid 9737); 23 Nov 2010 15:09:02 -0000
Date: Tue, 23 Nov 2010 15:09:00 -0000
Message-ID: <20101123150902.29444.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/config config.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-11/txt/msg00043.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-11-23 15:08:58

Modified files:
	lib/config     : config.c 

Log message:
	Move va_end() so it is also used before error path  return

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/config/config.c.diff?cvsroot=lvm2&r1=1.82&r2=1.83

--- LVM2/lib/config/config.c	2010/09/30 21:06:51	1.82
+++ LVM2/lib/config/config.c	2010/11/23 15:08:57	1.83
@@ -381,11 +381,12 @@
 
 	va_start(ap, fmt);
 	n = vsnprintf(&buf[0], sizeof buf - 1, fmt, ap);
+	va_end(ap);
+
 	if (n < 0 || n > (int) sizeof buf - 1) {
 		log_error("vsnprintf failed for config line");
 		return 0;
 	}
-	va_end(ap);
 
 	if (!dm_pool_grow_object(outline->mem, &buf[0], strlen(buf))) {
 		log_error("dm_pool_grow_object failed for config line");