Merge branch 'master' of git://localhost/acess2

[tpg/acess2.git] / KernelLand / Modules / Storage / LVM / volumes.c

diff --git a/KernelLand/Modules/Storage/LVM/volumes.c b/KernelLand/Modules/Storage/LVM/volumes.c
index f15b1b0..cf1a60d 100644 (file)
--- 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
@@ -56,6 +66,7 @@ int LVM_AddVolume(const tLVM_VolType *Type, const char *Name, void *Ptr, size_t
        real_vol->BlockCount = BlockCount;
        real_vol->nSubVolumes = dummy_vol.nSubVolumes;
        real_vol->SubVolumes = (void*)( real_vol->Name + strlen(Name) + 1 );
+       real_vol->BlockSize = BlockSize;
        strcpy(real_vol->Name, Name);
        memset(real_vol->SubVolumes, 0, sizeof(tLVM_SubVolume*) * real_vol->nSubVolumes);
        // - VFS Nodes