From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 20 Jul 2007 20:38:05 +0000 Subject: 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 --- indra/linux_crash_logger/linux_crash_logger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/linux_crash_logger/linux_crash_logger.cpp') 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; -- cgit v1.2.3