1 files changed, 4 insertions, 3 deletions

diff --git a/linden/indra/llvfs/llvfs.cpp b/linden/indra/llvfs/llvfs.cpp
index a41aa78..b83d12c 100644
--- a/linden/indra/llvfs/llvfs.cpp
+++ b/linden/indra/llvfs/llvfs.cpp
@@ -307,6 +307,8 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
                         {
                                 llwarns << "Couldn't open vfs data file after trying many alternates" << llendl;
                                 mValid = VFSVALID_BAD_CANNOT_CREATE;
+                                delete[] temp_index;
+                                delete[] temp_data;
                                 return;
                         }
 
@@ -394,7 +396,6 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
                         // to heal after some errors. JC
                         if (block->mLength > 0 &&
                                 (U32)block->mLength <= data_size &&
-                                block->mLocation >= 0 &&
                                 block->mLocation < data_size &&
                                 block->mSize > 0 &&
                                 block->mSize <= block->mLength &&
@@ -435,7 +436,7 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r
                                 delete block;
                         }
     
-                        tmp_ptr += block->SERIAL_SIZE;
+                        tmp_ptr += LLVFSFileBlock::SERIAL_SIZE;
                 }
                 delete[] buffer;
 
@@ -658,6 +659,7 @@ void LLVFS::presizeDataFile(const U32 size)
         if (!mDataFP)
         {
                 llerrs << "LLVFS::presizeDataFile() with no data file open" << llendl;
+                return;
         }
 
         // we're creating this file for the first time, size it
@@ -1731,7 +1733,6 @@ void LLVFS::audit()
     
                 // do sanity check on this block
                 if (block->mLength >= 0 &&
-                        block->mLocation >= 0 &&
                         block->mSize >= 0 &&
                         block->mSize <= block->mLength &&
                         block->mFileType >= LLAssetType::AT_NONE &&