diff options
| author | thickbrick | 2011-02-24 19:09:20 +0200 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-04 17:23:56 -0700 |
| commit | 242a3c5290ef3aa2ce9655fdc780692734b068a4 (patch) | |
| tree | 20f4c56e721373dee3193cc976349239c25acecd /linden | |
| parent | Updated default_grids.xml to include Aurora-Grid (diff) | |
| download | meta-impy-242a3c5290ef3aa2ce9655fdc780692734b068a4.zip meta-impy-242a3c5290ef3aa2ce9655fdc780692734b068a4.tar.gz meta-impy-242a3c5290ef3aa2ce9655fdc780692734b068a4.tar.bz2 meta-impy-242a3c5290ef3aa2ce9655fdc780692734b068a4.tar.xz | |
Workaround #726: SIGSEGV in memcpy in LLImageRaw::LLImageRaw with data=0
Not sure why this happens, but is related to mForceToSaveRawImage=TRUE
(e.g. in the texture preview floater.) This workaround seems to work for
Singularity, as suggested by Siana Gears.
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/llimage/llimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp index e933750..3a8dc3b 100644 --- a/linden/indra/llimage/llimage.cpp +++ b/linden/indra/llimage/llimage.cpp | |||
| @@ -269,7 +269,7 @@ LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components) | |||
| 269 | : LLImageBase() | 269 | : LLImageBase() |
| 270 | { | 270 | { |
| 271 | mMemType = LLMemType::MTYPE_IMAGERAW; | 271 | mMemType = LLMemType::MTYPE_IMAGERAW; |
| 272 | if(allocateDataSize(width, height, components)) | 272 | if(allocateDataSize(width, height, components) && data) |
| 273 | { | 273 | { |
| 274 | memcpy(getData(), data, width*height*components); | 274 | memcpy(getData(), data, width*height*components); |
| 275 | } | 275 | } |