diff options
author | Aleric Inglewood | 2010-09-30 02:17:43 +0200 |
---|---|---|
committer | McCabe Maxsted | 2010-10-01 23:56:59 -0700 |
commit | b5b6e556ed7e9fa6bdea2365e82765981ee9f28c (patch) | |
tree | f984604269dc1d49b271cbfefbe9dd2ce6bf13c7 /linden/indra/llmessage | |
parent | Update of doc/contributions.txt (diff) | |
download | meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.zip meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.gz meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.bz2 meta-impy-b5b6e556ed7e9fa6bdea2365e82765981ee9f28c.tar.xz |
SNOW-86: Dangerous macro leads to possible wrong code
See http://redmine.imprudenceviewer.org/issues/571
This patch appeared to already have been partially applied.
I added more semi-colons after all llendl (and LLENDL) macros,
and wrapped the lllog ... llendl construct into do { ... } while(0)
as is usual for macros that mimic a single statement.
The patch was double checked with regular expression greps and a compile.
Diffstat (limited to 'linden/indra/llmessage')
-rw-r--r-- | linden/indra/llmessage/lltemplatemessagebuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llmessage/lltemplatemessagebuilder.cpp b/linden/indra/llmessage/lltemplatemessagebuilder.cpp index e641980..1e17018 100644 --- a/linden/indra/llmessage/lltemplatemessagebuilder.cpp +++ b/linden/indra/llmessage/lltemplatemessagebuilder.cpp | |||
@@ -730,7 +730,7 @@ static S32 buildBlock(U8* buffer, S32 buffer_size, const LLMessageBlock* templat | |||
730 | << "Attempted to pack " | 730 | << "Attempted to pack " |
731 | << result + mvci.getSize() | 731 | << result + mvci.getSize() |
732 | << " bytes into a buffer with size " | 732 | << " bytes into a buffer with size " |
733 | << buffer_size << "." << llendl | 733 | << buffer_size << "." << llendl; |
734 | } | 734 | } |
735 | } | 735 | } |
736 | } | 736 | } |