Second Life viewer sources 1.19.1.3

2 files changed, 33 insertions, 3 deletions

diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index 15da71a..bcd9463 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -57,6 +57,7 @@ LLImageBase::LLImageBase()
           mComponents(0),
           mMemType(LLMemType::MTYPE_IMAGEBASE)
 {
+        mBadBufferAllocation = FALSE ;
 }
 
 // virtual
@@ -141,6 +142,7 @@ U8* LLImageBase::allocateData(S32 size)
         if (!mData || size != mDataSize)
         {
                 deleteData(); // virtual
+                mBadBufferAllocation = FALSE ;
                 mData = new U8[size];
                 if (!mData)
                 {
@@ -148,6 +150,7 @@ U8* LLImageBase::allocateData(S32 size)
                         llwarns << "allocate image data: " << size << llendl;
                         size = 0 ;
                         mWidth = mHeight = 0 ;
+                        mBadBufferAllocation = TRUE ;
                 }
                 mDataSize = size;
         }
@@ -176,6 +179,30 @@ U8* LLImageBase::reallocateData(S32 size)
         return mData;
 }
 
+const U8* LLImageBase::getData() const  
+{ 
+        if(mBadBufferAllocation)
+        {
+                llerrs << "Bad memory allocation for the image buffer!" << llendl ;
+        }
+
+        return mData; 
+} // read only
+
+U8* LLImageBase::getData()                              
+{ 
+        if(mBadBufferAllocation)
+        {
+                llerrs << "Bad memory allocation for the image buffer!" << llendl ;
+        }
+
+        return mData; 
+}
+
+BOOL LLImageBase::isBufferInvalid()
+{
+        return mBadBufferAllocation || mData == NULL ;
+}
 
 void LLImageBase::setSize(S32 width, S32 height, S32 ncomponents)
 {
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 8546303..199dc07 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -101,9 +101,10 @@ public:
         S8      getComponents() const   { return mComponents; }
         S32 getDataSize() const         { return mDataSize; }
 
-        const U8 *getData() const       { return mData; } // read only
-        U8 *getData()                           { return mData; }
-        
+        const U8 *getData() const       ;
+        U8 *getData()                           ;
+        BOOL isBufferInvalid() ;
+
         void setSize(S32 width, S32 height, S32 ncomponents);
         U8* allocateDataSize(S32 width, S32 height, S32 ncomponents, S32 size = -1); // setSize() + allocateData()
 
@@ -133,6 +134,8 @@ private:
 
         S8 mComponents;
 
+        BOOL mBadBufferAllocation ;
+
 public:
         S16 mMemType; // debug