[certi-cvs] certi libCERTI/BasicMessage.cc libRTI/RTI1516am...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/01/18 13:26:22

Modified files:
        libCERTI       : BasicMessage.cc 
        libRTI         : RTI1516ambassador.cpp 

Log message:
        Fix bug #32162 : std::wstring is not handled properly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/BasicMessage.cc?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/RTI1516ambassador.cpp?cvsroot=certi&r1=1.2&r2=1.3

Patches:
Index: libCERTI/BasicMessage.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/BasicMessage.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/BasicMessage.cc    10 Jun 2010 08:31:52 -0000      3.17
+++ libCERTI/BasicMessage.cc    18 Jan 2011 13:26:21 -0000      3.18
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: BasicMessage.cc,v 3.17 2010/06/10 08:31:52 erk Exp $
+// $Id: BasicMessage.cc,v 3.18 2011/01/18 13:26:21 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -123,11 +123,11 @@
        }
        _isLabelled = msgBuffer.read_bool();
        if (_isLabelled) {
-               msgBuffer.read_string(label);
+               setLabel(msgBuffer.read_string());
        }
        _isTagged = msgBuffer.read_bool();
        if (_isTagged) {
-               msgBuffer.read_string(tag);
+           setTag(msgBuffer.read_string());
        }
 } /* end of deserialize */
 
@@ -298,4 +298,4 @@
 
 } // namespace certi
 
-// $Id: BasicMessage.cc,v 3.17 2010/06/10 08:31:52 erk Exp $
+// $Id: BasicMessage.cc,v 3.18 2011/01/18 13:26:21 erk Exp $

Index: libRTI/RTI1516ambassador.cpp
===================================================================
RCS file: /sources/certi/certi/libRTI/RTI1516ambassador.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libRTI/RTI1516ambassador.cpp        31 May 2010 09:33:25 -0000      1.2
+++ libRTI/RTI1516ambassador.cpp        18 Jan 2011 13:26:22 -0000      1.3
@@ -122,10 +122,7 @@
        }
 
        std::string varLengthDataAsString(VariableLengthData varLengthData) {
-               char *buf = (char*) calloc(varLengthData.size() + 1, 
sizeof(char));
-               memcpy(buf, varLengthData.data(), varLengthData.size());
-               std::string retVal(buf);
-               free(buf);
+               std::string retVal( (char*)varLengthData.data(), 
varLengthData.size() );
                return retVal;
        }