Changeset 10387 for trunk

Timestamp:

04/18/11 13:59:16 (14 years ago)

Author:

tbretz

Message:

Fixed interpreting of zero length or strings shorter than expected.

File:

• trunk/FACT++/src/Converter.cc (modified) (3 diffs)

trunk/FACT++/src/Converter.cc

@@ -424 +424 @@
 {
     const string txt(ptr);
-    str += " [" + txt + "]";
+    str += ' '+txt;
     ptr += txt.length()+1;
 }
@@ -647 +647 @@
     for (Converter::FormatList::const_iterator i=fList.begin(); i<fList.end()-1; i++)
     {
-        if (ptr-size>=dat)
+        if (ptr-size>dat)
         {
             ostringstream err;
@@ -656 +656 @@
         if (*i->first.first == typeid(string))
         {
-            AddString(text, ptr);
+            if (size>0)
+                AddString(text, ptr);
+            if (ptr-size<=dat)
+                return text;
             break;
         }