Changeset 108028 in vbox for trunk/src

Timestamp:

Feb 3, 2025 3:56:40 PM (3 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167301

Message:

Runtime/RTScriptLex*: Fix filling the buffer and zeroing the remainder under certain circumstances, bugref:10733

File:

• trunk/src/VBox/Runtime/common/script/scriptlex.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/script/scriptlex.cpp

@@ -375 +375 @@
 
     /* If there is input left to process move it to the front and fill the remainder. */
-    if (pThis->pchCur != NULL)
+    if (   pThis->pchCur != NULL
+        && pThis->pchCur != &pThis->achBuf[pThis->cchBuf])
     {
         cchToRead = pThis->pchCur - &pThis->achBuf[0];
@@ -381 +382 @@
         memmove(&pThis->achBuf[0], pThis->pchCur, pThis->cchBuf - cchToRead);
         pchRead = (char *)pThis->pchCur + 1;
-        memset(pchRead, 0, cchToRead);
     }
 
@@ -395 +395 @@
             if (rc == VINF_EOF)
                 pThis->fFlags |= RTSCRIPT_LEX_INT_F_EOS;
+            if (cchRead < cchToRead)
+                memset(pchRead + cchRead, 0, cchToRead - cchRead);
             rc = VINF_SUCCESS;
         }