From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3586-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 4275 invoked by alias); 25 Oct 2010 12:57:01 -0000
Received: (qmail 4256 invoked by uid 9737); 25 Oct 2010 12:57:01 -0000
Date: Mon, 25 Oct 2010 12:57:00 -0000
Message-ID: <20101025125701.4254.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/tools lvm.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-10/txt/msg00069.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-10-25 12:57:00

Modified files:
	tools          : lvm.c 

Log message:
	Fix potential NULL pointer dereference
	
	Makes clang happier as it covers all code paths and avoids NULL pointer
	dereference through the 'com' pointer (which is NULL by default static
	initialisation).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvm.c.diff?cvsroot=lvm2&r1=1.113&r2=1.114

--- LVM2/tools/lvm.c	2010/07/09 15:34:48	1.113
+++ LVM2/tools/lvm.c	2010/10/25 12:57:00	1.114
@@ -85,11 +85,11 @@
 				break;
 			}
 		}
-
-		if (!com)
-			return NULL;
 	}
 
+	if (!com)
+		return NULL;
+
 	/* Short form arguments */
 	if (len < 3) {
 		while (match_no < com->num_args) {