Changeset 0ca15b7 for libcfa/src/containers/string_res.cfa

Timestamp:

Oct 19, 2021, 9:55:27 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

2b30370

Parents:

fe18b46

Message:

String hybrid testing and fixing the overwrite cases

File:

• libcfa/src/containers/string_res.cfa (modified) (4 diffs)

libcfa/src/containers/string_res.cfa

@@ -405 +405 @@
 
     verify( shareEditSetEndPeer->Handle.s >= shareEditSetStartPeer->Handle.s );
-    size_t editSetLength = shareEditSetEndPeer->Handle.s + shareEditSetEndPeer->Handle.lnth - shareEditSetStartPeer->Handle.s;
-    verify( editSetLength >= this.Handle.lnth );
+    size_t origEditSetLength = shareEditSetEndPeer->Handle.s + shareEditSetEndPeer->Handle.lnth - shareEditSetStartPeer->Handle.s;
+    verify( origEditSetLength >= this.Handle.lnth );
 
     if ( this.shareEditSet_owns_ulink ) {                 // assigning to private context
@@ -418 +418 @@
         if ( char * oldBytes = VbyteTryAdjustLast( *this.Handle.ulink, delta ) ) {
             // growing: copy from old to new
-            char * dest = VbyteAlloc( *this.Handle.ulink, editSetLength );
+            char * dest = VbyteAlloc( *this.Handle.ulink, origEditSetLength + delta );
             char *destCursor = dest;  memcpy(destCursor, prefixStartOrig, prefixLen);
             destCursor += prefixLen;  memcpy(destCursor, buffer         , bsize    );
@@ -424 +424 @@
             assignEditSet(this, shareEditSetStartPeer, shareEditSetEndPeer, 
                 dest,
-                editSetLength,
+                origEditSetLength + delta,
                 0p, bsize);
             free( oldBytes );
@@ -434 +434 @@
             assignEditSet(this, shareEditSetStartPeer, shareEditSetEndPeer, 
                 shareEditSetStartPeer->Handle.s,
-                editSetLength,
+                origEditSetLength + delta,
                 0p, bsize);
         }
 
     } else if (                                           // assigning to shared context
-        this.Handle.lnth == editSetLength &&              // overwriting entire run of SES
+        this.Handle.lnth == origEditSetLength &&          // overwriting entire run of SES
         & valSrc &&                                       // sourcing from a managed string
         valSrc.Handle.ulink == this.Handle.ulink  ) {     // sourcing from same heap