From a75b85112ffa4b7140561083c2e5de05fb510805 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 7 May 2008 21:10:39 +0000
Subject: [PATCH] svn merge -r 86558:86977
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server
* QAR-567 Deploy user-start-migration-again login.cgi and friends to agni
* DEV-14807 dir-places and dir-classifieds web-ds calls are failing
* DEV-9962 SVC-1428: Malformed llInstantMessage() gets sent to email, stuck in queue, and spammed to email at every login
* DEV-12696 Limit the number of group_notices in a group
NOTE: merge involved renames to the following to have "nq" extension
* indra/web/dataservice/sql/sequence/cart_items/update (actual change)
* indra/web/dataservice/sql/indra/select-dir-places-parcel (which was a no-op merge)
The magic words are: dataserver-is-deprecated
---
indra/llmessage/llfiltersd2xmlrpc.cpp | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/indra/llmessage/llfiltersd2xmlrpc.cpp b/indra/llmessage/llfiltersd2xmlrpc.cpp
index 88f7b1cb68..07a3655697 100644
--- a/indra/llmessage/llfiltersd2xmlrpc.cpp
+++ b/indra/llmessage/llfiltersd2xmlrpc.cpp
@@ -695,6 +695,24 @@ LLIOPipe::EStatus LLFilterXMLRPCRequest2LLSD::process_impl(
buffer->readAfter(channels.in(), NULL, (U8*)buf, bytes);
//lldebugs << "xmlrpc request: " << buf << llendl;
+
+ // Check the value in the buffer. XMLRPC_REQUEST_FromXML will report a error code 4 if
+ // values that are less than 0x20 are passed to it, except
+ // 0x09: Horizontal tab; 0x0a: New Line; 0x0d: Carriage
+ U8* cur_pBuf = (U8*)buf;
+ U8 cur_char;
+ for (S32 i=0; i<bytes; i++)
+ {
+ cur_char = *cur_pBuf;
+ if ( cur_char < 0x20
+ && 0x09 != cur_char
+ && 0x0a != cur_char
+ && 0x0d != cur_char )
+ {
+ *cur_pBuf = '?';
+ }
+ ++cur_pBuf;
+ }
PUMP_DEBUG;
XMLRPC_REQUEST request = XMLRPC_REQUEST_FromXML(
--
GitLab