Changeset 90847 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Aug 24, 2021 1:16:58 PM (3 years ago)

Author:

vboxsync

Message:

IPRT/log: Fix loop-forver issue in LF->CRLF translation. bugref:10086

File:

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

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -4587 +4587 @@
                 cb = cbBuf - offBuf - 1;
             }
-            else if (cb <= 0)
+            else if (cb <= 2) /* 2  - Make sure we can write a \r\n and not loop forever. */
             {
                 rtlogFlush(pLoggerInt, true /*fNeedSpace*/);
@@ -4607 +4607 @@
                     pLoggerInt->fPendingPrefix = true;
                 }
-                else if (cbBuf - offBuf < (uintptr_t)(pszNewLine - pachChars + 2))
+                else if ((uintptr_t)(pszNewLine - pachChars) + 2U < cbBuf - offBuf)
                 {
                     cb = pszNewLine - pachChars;
@@ -4613 +4613 @@
                     pchBuf[offBuf + cb++] = '\r';
                     pchBuf[offBuf + cb++] = '\n';
-                    pachChars--;    /* Discount the extra '\r'. */
                     cbChars++;      /* Discount the extra '\r'. */
+                    pachChars--;    /* Ditto. */
                     cbRet--;        /* Ditto. */
                     pLoggerInt->fPendingPrefix = true;