1 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/llmessage/llsdmessagereader.cpp b/linden/indra/llmessage/llsdmessagereader.cpp
index 2cf74e8..e699ec9 100755
--- a/linden/indra/llmessage/llsdmessagereader.cpp
+++ b/linden/indra/llmessage/llsdmessagereader.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -107,6 +108,12 @@ void LLSDMessageReader::getBinaryData(const char *block, const char *var,
                 data_size = max_size;
         }
         
+        // Calls to memcpy will fail if data_size is not positive.
+        // Phoenix 2009-02-27
+        if(data_size <= 0)
+        {
+                return;
+        }
         memcpy(datap, &(data[0]), data_size);
 }