Changeset 2962 in kBuild

Timestamp:

Sep 22, 2016 11:30:03 PM (8 years ago)

Author:

bird

Message:

kWorker: Fixed combined console buffer overflow problem when there's a lot of errors/output.

File:

• trunk/src/kWorker/kWorker.c (modified) (5 diffs)

trunk/src/kWorker/kWorker.c

@@ -7207 +7207 @@
         {
             /* Need to grow the line buffer? */
-            KU32 cwcNeeded = offLastIncompleteLine != 0 ? offLastIncompleteLine : cchLastIncompleteLine + pLineBuf->u.Con.cwcBuf;
+            KU32 cwcNeeded = offLastIncompleteLine == 0
+                           ? pLineBuf->u.Con.cwcBuf + cchLastIncompleteLine /* incomplete line, append to line buffer */
+                           : cchLastIncompleteLine; /* Only the final incomplete line (if any) goes to the line buffer. */
             if (cwcNeeded > pLineBuf->u.Con.cwcBufAlloc)
             {
@@ -7255 +7257 @@
 
         /*
-         * If there is sufficient combined buffer to handle this request, this are rather simple.
+         * If there is sufficient combined buffer to handle this request, this is rather simple.
          */
-        if (pLineBuf->u.Con.cwcBuf + cchLastIncompleteLine <= K_ELEMENTS(pSandbox->Combined.wszBuf))
+        kHlpAssert(pSandbox->Combined.cwcBuf <= K_ELEMENTS(pSandbox->Combined.wszBuf));
+        if (pSandbox->Combined.cwcBuf + pLineBuf->u.Con.cwcBuf + offLastIncompleteLine <= K_ELEMENTS(pSandbox->Combined.wszBuf))
         {
             if (pLineBuf->u.Con.cwcBuf > 0)
@@ -7280 +7283 @@
             KU32 offNextLine = 0;
 
-            /* If there is buffered chars, we handle the first line outside the
+            /* If there are buffered chars, we handle the first line outside the
                main loop.  We must try our best outputting it as a complete line. */
             if (pLineBuf->u.Con.cwcBuf > 0)
@@ -7289 +7292 @@
                 kHlpAssert(offNextLine <= offLastIncompleteLine);
 
-                if (pLineBuf->u.Con.cwcBuf + offNextLine + pSandbox->Combined.cwcBuf <= K_ELEMENTS(pSandbox->Combined.wszBuf))
+                if (pSandbox->Combined.cwcBuf + pLineBuf->u.Con.cwcBuf + offNextLine <= K_ELEMENTS(pSandbox->Combined.wszBuf))
                 {
                     kHlpMemCopy(&pSandbox->Combined.wszBuf[pSandbox->Combined.cwcBuf],
@@ -7336 +7339 @@
          * Buffer any remaining incomplete line chars.
          */
-        if (offLastIncompleteLine < cwcToWrite)
+        if (cchLastIncompleteLine)
         {
             kHlpMemCopy(&pLineBuf->u.Con.pwcBuf[0], &pwcBuffer[offLastIncompleteLine], cchLastIncompleteLine * sizeof(wchar_t));