diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-26 13:46:45 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-26 13:46:45 -0700 |
| commit | 78866b33a9f3a44db11a18245e8a37c834297a46 (patch) | |
| tree | fd5c39a17334de8602ee2f20df020eaaa6e01e55 /indra/llimage/llimagebmp.cpp | |
| parent | 2d5fa7a732661f97b028ddcbabdd4fb3ba825a52 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merge
Diffstat (limited to 'indra/llimage/llimagebmp.cpp')
| -rw-r--r-- | indra/llimage/llimagebmp.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llimage/llimagebmp.cpp b/indra/llimage/llimagebmp.cpp index 2cdd26c22b..867b2bb47b 100644 --- a/indra/llimage/llimagebmp.cpp +++ b/indra/llimage/llimagebmp.cpp @@ -318,7 +318,7 @@ bool LLImageBMP::updateData() if( 0 != mColorPaletteColors ) { - mColorPalette = new U8[color_palette_size]; + mColorPalette = new(std::nothrow) U8[color_palette_size]; if (!mColorPalette) { LL_ERRS() << "Out of memory in LLImageBMP::updateData()" << LL_ENDL; @@ -344,7 +344,11 @@ bool LLImageBMP::decode(LLImageRaw* raw_image, F32 decode_time) return false; } - raw_image->resize(getWidth(), getHeight(), 3); + if (!raw_image->resize(getWidth(), getHeight(), 3)) + { + setLastError("llimagebmp failed to resize image!"); + return false; + } U8* src = mdata + mBitmapOffset; U8* dst = raw_image->getData(); |