diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-27 13:18:49 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-27 13:18:49 -0800 |
| commit | c69ee5ced1ba3b8e96a08e2f0344eedd971ef3c1 (patch) | |
| tree | 557e4c8c90db7c16ad5b7072d0ffd3b4e67fec62 /indra/llmessage | |
| parent | 3aed137a33712f9000333aa814f76183158183cb (diff) | |
CID-100
Checker: INVALIDATE_ITERATOR
Function: buildBlock(unsigned char *, int, const LLMessageBlock *, LLMsgData *)
File: /indra/llmessage/lltemplatemessagebuilder.cpp
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/lltemplatemessagebuilder.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmessage/lltemplatemessagebuilder.cpp b/indra/llmessage/lltemplatemessagebuilder.cpp index 6400310c46..55379fc6fd 100644 --- a/indra/llmessage/lltemplatemessagebuilder.cpp +++ b/indra/llmessage/lltemplatemessagebuilder.cpp @@ -737,10 +737,14 @@ static S32 buildBlock(U8* buffer, S32 buffer_size, const LLMessageBlock* templat } --block_count; - ++block_iter; + if (block_iter != message_data->mMemberBlocks.end()) { - mbci = block_iter->second; + ++block_iter; + if (block_iter != message_data->mMemberBlocks.end()) + { + mbci = block_iter->second; + } } } |