Changeset 989 for cpp/frams/util

Timestamp:

07/09/20 00:21:37 (4 years ago)

Author:

Maciej Komosinski

Message:

SString::endWrite()/endAppend() now safe

Location:

cpp/frams/util

Files:

• sstring-simple.cpp (modified) (1 diff)
• sstring.cpp (modified) (2 diffs)

cpp/frams/util/sstring-simple.cpp

@@ -76 +76 @@
 {
         if (newlength < 0) newlength = strlen(txt);
-        else txt[newlength] = 0;
+        else
+        {
+                if (newlength >= allocated)
+                {
+                        assert(newlength < allocated);
+                        if (allocated == 0) return;
+                        newlength = allocated - 1;
+                }
+                txt[newlength] = 0;
+        }
         used = newlength;
-        assert(used < allocated);
 }
 
 void SString::endAppend(int newappend)
 {
-        if (newappend < 0) newappend = strlen(txt + appending);
-        else txt[appending + newappend] = 0;
-        used = appending + newappend;
-        assert(used < allocated);
+        if (newappend < 0) endWrite(appending + strlen(txt + appending));
+        else endWrite(newappend + appending);
 }
 

cpp/frams/util/sstring.cpp

@@ -222 +222 @@
 {
         if (newlength < 0) newlength = strlen(buf->txt);
-        else buf->txt[newlength] = 0;
+        else
+        {
+                if ((newlength >= (buf->size + 1)) || (buf->size == 0))
+                {
+                        assert((newlength < (buf->size + 1)) && (buf->size > 0));
+                        if (buf->size == 0) return;
+                        newlength = buf->size;
+                }
+                buf->txt[newlength] = 0;
+        }
         buf->used = newlength;
 }
@@ -228 +237 @@
 void SString::endAppend(int newappend)
 {
-        if (newappend < 0) newappend = strlen(buf->txt + appending);
-        else buf->txt[appending + newappend] = 0;
-        buf->used = appending + newappend;
+        if (newappend < 0) endWrite(appending + strlen(buf->txt + appending));
+        else endWrite(newappend + appending);
 }