1 files changed, 28 insertions, 14 deletions

diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 924d903..c5b897b 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -3,6 +3,8 @@
  * @brief Subclass capable of loading asset data to/from an external
  * source. Currently, a web server accessed via curl
  *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
@@ -336,15 +339,17 @@ size_t LLHTTPAssetRequest::readCompressedData(void* data, size_t size)
 
         while (mZStream.avail_out > 0)
         {
-                if (mZStream.avail_in == 0  &&  !mZInputExhausted)
+                if (mZStream.avail_in == 0 && !mZInputExhausted)
                 {
                         S32 to_read = llmin(COMPRESSED_INPUT_BUFFER_SIZE,
                                                         (S32)(mVFile->getSize() - mVFile->tell()));
                         
-                        mVFile->read((U8*)mZInputBuffer, to_read); /*Flawfinder: ignore*/
-
-                        mZStream.next_in = (Bytef*)mZInputBuffer;
-                        mZStream.avail_in = mVFile->getLastBytesRead();
+                        if ( to_read > 0 )
+                        {
+                                mVFile->read((U8*)mZInputBuffer, to_read); /*Flawfinder: ignore*/
+                                mZStream.next_in = (Bytef*)mZInputBuffer;
+                                mZStream.avail_in = mVFile->getLastBytesRead();
+                        }
 
                         mZInputExhausted = mZStream.avail_in == 0;
                 }
@@ -352,8 +357,13 @@ size_t LLHTTPAssetRequest::readCompressedData(void* data, size_t size)
                 int r = deflate(&mZStream,
                                         mZInputExhausted ? Z_FINISH : Z_NO_FLUSH);
 
-                if (r == Z_STREAM_END)
+                if (r == Z_STREAM_END || r < 0 || mZInputExhausted)
                 {
+                        if (r < 0)
+                        {
+                                llwarns << "LLHTTPAssetRequest::readCompressedData: deflate returned error code " 
+                                                << (S32) r << llendl;
+                        }
                         break;
                 }
         }
@@ -365,15 +375,20 @@ size_t LLHTTPAssetRequest::readCompressedData(void* data, size_t size)
 size_t LLHTTPAssetRequest::curlCompressedUploadCallback(
                 void *data, size_t size, size_t nmemb, void *user_data)
 {
-        if (!gAssetStorage)
+        size_t num_read = 0;
+
+        if (gAssetStorage)
         {
-                return 0;
+                CURL *curl_handle = (CURL *)user_data;
+                LLHTTPAssetRequest *req = NULL;
+                curl_easy_getinfo(curl_handle, CURLINFO_PRIVATE, &req);
+                if (req)
+                {
+                        num_read = req->readCompressedData(data, size * nmemb);
+                }
         }
-        CURL *curl_handle = (CURL *)user_data;
-        LLHTTPAssetRequest *req = NULL;
-        curl_easy_getinfo(curl_handle, CURLINFO_PRIVATE, &req);
 
-        return req->readCompressedData(data, size * nmemb);
+        return num_read;
 }
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -531,9 +546,8 @@ void LLHTTPAssetStorage::storeAssetData(
                 {
                         callback(LLUUID::null, user_data, LL_ERR_CANNOT_OPEN_FILE, LL_EXSTAT_BLOCKED_FILE);
                 }
+                delete legacy;
         }
-        // Coverity CID-269 says there's a leak of 'legacy' here, but
-        // legacyStoreDataCallback() will delete it somewhere down the line.
 }
 
 // virtual