Changeset 2908

Timestamp:

Sep 10, 2016, 12:48:40 AM (9 years ago)

Author:

bird

Message:

use alloca, get the vsnprintf check right.

File:

• trunk/src/lib/msc_buffered_printf.c (modified) (2 diffs)

trunk/src/lib/msc_buffered_printf.c

@@ -90 +90 @@
             if (isatty(fd))
             {
-                char szTmp[8192];
+                char *pszTmp = (char *)alloca(16384);
                 va_list va2 = va;
-                int cchRet = vsnprintf(szTmp, sizeof(szTmp), pszFormat, va2);
-                if (cchRet >= sizeof(szTmp) - 1)
-                    return (int)maybe_con_fwrite(szTmp, cchRet, 1, stdout);
+                int cchRet = vsnprintf(pszTmp, 16384, pszFormat, va2);
+                if (cchRet < 16384 - 1)
+                    return (int)maybe_con_fwrite(pszTmp, cchRet, 1, stdout);
             }
         }
@@ -131 +131 @@
             if (isatty(fd))
             {
-                char szTmp[8192];
-                va_start(va, pszFormat);
-                cchRet = vsnprintf(szTmp, sizeof(szTmp), pszFormat, va);
-                va_end(va);
-                if (cchRet >= sizeof(szTmp) - 1)
-                    return (int)maybe_con_fwrite(szTmp, cchRet, 1, pFile);
+                char *pszTmp = (char *)alloca(16384);
+                if (pszTmp)
+                {
+                    va_start(va, pszFormat);
+                    cchRet = vsnprintf(pszTmp, 16384, pszFormat, va);
+                    va_end(va);
+                    if (cchRet < 16384 - 1)
+                        return (int)maybe_con_fwrite(pszTmp, cchRet, 1, pFile);
+                }
             }
         }