diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-17 10:36:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-17 10:36:04 -0500 |
| commit | 323d27ebcb07fb28ae81ea3728c8ccf65f5ddd68 (patch) | |
| tree | 8592099f72205befac80ee9a15192032451781d1 /indra/llcommon | |
| parent | f6b8bfd3da163d275400035b24a969e5147c6352 (diff) | |
| parent | f1c27071047e776536f8aa963b83f8772275e7c3 (diff) | |
merge changes for vmrg-216
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 19075afa68..6073bcd0a6 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -1364,11 +1364,21 @@ BOOL gzip_file(const std::string& srcfile, const std::string& dstfile) src = LLFile::fopen(srcfile, "rb"); /* Flawfinder: ignore */ if (! src) goto err; - do + while ((bytes = (S32)fread(buffer, sizeof(U8), COMPRESS_BUFFER_SIZE, src)) > 0) { - bytes = (S32)fread(buffer, sizeof(U8), COMPRESS_BUFFER_SIZE,src); - gzwrite(dst, buffer, bytes); - } while(feof(src) == 0); + if (gzwrite(dst, buffer, bytes) <= 0) + { + llwarns << "gzwrite failed: " << gzerror(dst, NULL) << llendl; + goto err; + } + } + + if (ferror(src)) + { + llwarns << "Error reading " << srcfile << llendl; + goto err; + } + gzclose(dst); dst = NULL; #if LL_WINDOWS |