Changeset 788 for trunk/src/core/RpLibrary.cc

Timestamp:

Jul 30, 2007, 10:08:29 AM (17 years ago)

Author:

dkearney

Message:

adjustments to entity references encoding to include the length of the string to encode and decode.
this is used for the python bindings, so we can know the length of the string being returned and allow embedded nulls.

File:

• trunk/src/core/RpLibrary.cc (modified) (4 diffs)

trunk/src/core/RpLibrary.cc

@@ -1539 +1539 @@
     status &= Rappture::encoding::decode(inData,0);
     status.addContext("RpLibrary::getSting");
-    inData.append("\0",1);
+    // inData.append("\0",1);
 
     if (translateFlag == RPLIB_TRANSLATE) {
-        translatedContents = ERTranslator.decode(inData.bytes());
+        translatedContents = ERTranslator.decode(inData.bytes(),inData.size());
         if (translatedContents == NULL) {
             // translation failed
@@ -1551 +1551 @@
         }
         else {
-            retStr = std::string(translatedContents);
+            // subtract 1 from size because ERTranslator adds extra NULL
+            retStr = std::string(translatedContents,ERTranslator.size()-1);
             translatedContents = NULL;
         }
     }
     else {
-        retStr = std::string(inData.bytes());
+        retStr = std::string(inData.bytes(),inData.size());
     }
 
@@ -1701 +1702 @@
 
     if (translateFlag == RPLIB_TRANSLATE) {
-        translatedContents = ERTranslator.decode(retCStr);
+        translatedContents = ERTranslator.decode(retCStr,0);
         if (translatedContents == NULL) {
             // translation failed
@@ -1769 +1770 @@
 
         if (translateFlag == RPLIB_TRANSLATE) {
-            translatedContents = ERTranslator.encode(value.c_str());
+            translatedContents = ERTranslator.encode(value.c_str(),0);
         }
         else {