diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-09 15:23:53 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-09 15:23:53 -0700 |
| commit | 91956a0f44bb6a15e4af58dd328e1a0c5bbc0553 (patch) | |
| tree | aac58db318246305e39d0253c1db664b4913126b /indra/llvfs/llvfs.cpp | |
| parent | 3039663148b0adc64220964b10cad595e5137cc0 (diff) | |
| parent | e1f2b2b3e82a2415abe9d2c0e548319284e0f2bf (diff) | |
merge
Diffstat (limited to 'indra/llvfs/llvfs.cpp')
| -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) { |