From: John Hodge <tpg@mutabah.net>
Date: Tue, 7 Aug 2012 09:00:56 +0000 (+0800)
Subject: Modules/LVM - Catches for stupid coding
X-Git-Tag: rel0.15~706^2~64
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=fc7371134c3b43b4382655f3b5447749da12b306;p=tpg%2Facess2.git

Modules/LVM - Catches for stupid coding
---

diff --git a/KernelLand/Modules/Storage/LVM/volumes.c b/KernelLand/Modules/Storage/LVM/volumes.c
index c9ce9a82..cf1a60d1 100644
--- a/KernelLand/Modules/Storage/LVM/volumes.c
+++ b/KernelLand/Modules/Storage/LVM/volumes.c
@@ -30,6 +30,12 @@ int LVM_AddVolume(const tLVM_VolType *Type, const char *Name, void *Ptr, size_t
 	tLVM_Format	*fmt;
 	void	*first_block;
 
+	if( BlockCount == 0 || BlockSize == 0 ) {
+		Log_Error("LVM", "BlockSize(0x%x)/BlockCount(0x%x) invalid in LVM_AddVolume",
+			BlockSize, BlockCount);
+		return 1;
+	}
+
 	dummy_vol.Type = Type;
 	dummy_vol.Ptr = Ptr;
 	dummy_vol.BlockCount = BlockCount;
@@ -37,6 +43,10 @@ int LVM_AddVolume(const tLVM_VolType *Type, const char *Name, void *Ptr, size_t
 
 	// Read the first block of the volume	
 	first_block = malloc(BlockSize);
+	if( !first_block ) {
+		Log_Error("VLM", "LVM_AddVolume - malloc error on %i bytes", BlockSize);
+		return -1;
+	}
 	Type->Read(Ptr, 0, 1, first_block);
 	
 	// Determine Format