From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2540-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 15690 invoked by alias); 11 Dec 2009 13:04:31 -0000
Received: (qmail 15675 invoked by uid 9737); 11 Dec 2009 13:04:30 -0000
Date: Fri, 11 Dec 2009 13:04:00 -0000
Message-ID: <20091211130430.15673.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/tools dmsetup.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: 2009-12/txt/msg00029.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2009-12-11 13:04:30

Modified files:
	tools          : dmsetup.c 

Log message:
	Fix coredump and memory leak for 'dmsetup help -c'

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/dmsetup.c.diff?cvsroot=lvm2&r1=1.128&r2=1.129

--- LVM2/tools/dmsetup.c	2009/11/13 12:43:22	1.128
+++ LVM2/tools/dmsetup.c	2009/12/11 13:04:30	1.129
@@ -2402,7 +2402,7 @@
 	size_t len = 0;
 	int r = 0;
 
-	if (!strcmp(c->name, "splitname"))
+	if (c && !strcmp(c->name, "splitname"))
 		options = (char *) splitname_report_options;
 
 	/* emulate old dmsetup behaviour */
@@ -2591,7 +2591,11 @@
 		_switches[OPTIONS_ARG] = 1;
 		_string_args[OPTIONS_ARG] = (char *) "help";
 		_switches[SORT_ARG] = 0;
-	
+
+		if (_report) {
+			dm_report_free(_report);
+			_report = NULL;
+		}
 		(void) _report_init(NULL);
 	}