aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage/lltemplatemessagebuilder.cpp
diff options
context:
space:
mode:
authorAleric Inglewood2010-09-30 02:17:43 +0200
committerAleric Inglewood2010-09-30 02:17:43 +0200
commit5585f21a28019067af2800837d72bab23908f882 (patch)
tree9c06e1cc63aef19faea1292927f43a93e547c93b /linden/indra/llmessage/lltemplatemessagebuilder.cpp
parentUpdate of doc/contributions.txt (diff)
downloadmeta-impy-5585f21a28019067af2800837d72bab23908f882.zip
meta-impy-5585f21a28019067af2800837d72bab23908f882.tar.gz
meta-impy-5585f21a28019067af2800837d72bab23908f882.tar.bz2
meta-impy-5585f21a28019067af2800837d72bab23908f882.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 '')
-rw-r--r--linden/indra/llmessage/lltemplatemessagebuilder.cpp2
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 }