diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
| commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
| tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/linux_crash_logger | |
| parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) | |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/linux_crash_logger')
| -rw-r--r-- | indra/linux_crash_logger/linux_crash_logger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp index 12a513c136..1b7d2870dc 100644 --- a/indra/linux_crash_logger/linux_crash_logger.cpp +++ b/indra/linux_crash_logger/linux_crash_logger.cpp @@ -454,9 +454,9 @@ LLFileEncoder::LLFileEncoder(const char *form_name, const char *filename, bool i S32 buf_size = stat_data.st_size; FILE *fp = fopen(mFilename.c_str(), "rb"); U8 *buf = new U8[buf_size + 1]; - fread(buf, 1, buf_size, fp); + size_t nread = fread(buf, 1, buf_size, fp); fclose(fp); - buf[buf_size] = 0; + buf[nread] = 0; mBuf = (char *)buf; |