diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-03 17:52:52 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-03 17:52:52 -0700 |
| commit | 032e5d30c07b77402c9f38365a5b2d424ae25271 (patch) | |
| tree | b21cfae1240d222f1cf82c9154e7bbdcf5fe57e5 /indra/llvfs | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
| parent | 0d5a0cefd4d5b34d3c8e9d06621ec3e1f4e5d46b (diff) | |
Merge.
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index c1fe21c57d..78b67e9b68 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -26,6 +26,8 @@ #include "linden_common.h" +#include "llvfs.h" + #include <sys/stat.h> #include <set> #include <map> @@ -39,8 +41,6 @@ #include <sys/file.h> #endif -#include "llvfs.h" - #include "llstl.h" #include "lltimer.h" @@ -1711,7 +1711,8 @@ void LLVFS::audit() BOOL vfs_corrupt = FALSE; - std::vector<U8> buffer(index_size); + // since we take the address of element 0, we need to have at least one element. + std::vector<U8> buffer(llmax<size_t>(index_size,1U)); if (fread(&buffer[0], 1, index_size, mIndexFP) != index_size) { |