diff --git a/doc/contributions.txt b/doc/contributions.txt index dabae001a3845c3bd9068797283b99accb65aefa..5307c5345c74d63c0c056f9a99732fe7a65b98da 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -825,6 +825,7 @@ Kitty Barnett MAINT-6568 STORM-2149 MAINT-7581 + MAINT-7081 Kolor Fall Komiko Okamoto Korvel Noh diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 1085b159769b0f27361416fd493b17ddd9eb71fa..f917faadd4326542a06626ff2076cc817fdffbdf 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1746,7 +1746,7 @@ bool LLTextureFetchWorker::doWork(S32 param) // In case of a partial response, our offset may // not be trivially contiguous with the data we have. // Get back into alignment. - if (mHttpReplyOffset > cur_size) + if ( (mHttpReplyOffset > cur_size) || (cur_size > mHttpReplyOffset + append_size)) { LL_WARNS(LOG_TXT) << "Partial HTTP response produces break in image data for texture " << mID << ". Aborting load." << LL_ENDL;