Synchronize with trunk r58528.

[reactos.git] / lib / sdk / crt / printf / _sxprintf.c

diff --git a/lib/sdk/crt/printf/_sxprintf.c b/lib/sdk/crt/printf/_sxprintf.c
index 44d35ec..28d77aa 100644 (file)
--- a/lib/sdk/crt/printf/_sxprintf.c
+++ b/lib/sdk/crt/printf/_sxprintf.c
@@ -10,6 +10,9 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <tchar.h>
+#if IS_SECAPI
+#include <internal/safecrt.h>
+#endif
 
 #ifdef _UNICODE
 #define _tstreamout wstreamout
@@ -17,6 +20,8 @@
 #define _tstreamout streamout
 #endif
 
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+
 int _cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr);
 
 int
@@ -27,6 +32,9 @@ _cdecl
 #endif
 _sxprintf(
     TCHAR *buffer,
+#if IS_SECAPI
+    size_t sizeOfBuffer,
+#endif
 #if USE_COUNT
    size_t count,
 #endif
@@ -37,20 +45,42 @@ _sxprintf(
     ...)
 #endif
 {
+#if !USE_COUNT
+    const size_t count = INT_MAX;
+#endif
+#if !IS_SECAPI
+    const size_t sizeOfBuffer = count;
+#endif
 #if !USE_VARARGS
     va_list argptr;
 #endif
     int result;
     FILE stream;
 
+    /* Check trivial case */
+    if ((buffer == NULL) && (count == 0) && (sizeOfBuffer == 0))
+    {
+        return 0;
+    }
+
+#if IS_SECAPI
+    /* Validate parameters */
+    if (MSVCRT_CHECK_PMT(((buffer == NULL) || (format == NULL) || (sizeOfBuffer <= 0))))
+    {
+        errno = EINVAL;
+        return -1;
+    }
+
+    /* Limit output to count + 1 characters */
+    if (count != -1)
+        sizeOfBuffer = min(sizeOfBuffer, count + 1);
+#endif
+
+    /* Setup the FILE structure */
     stream._base = (char*)buffer;
     stream._ptr = stream._base;
     stream._charbuf = 0;
-#if USE_COUNT
-    stream._cnt = (int)(count * sizeof(TCHAR));
-#else
-    stream._cnt = INT_MAX;
-#endif
+    stream._cnt = (int)(sizeOfBuffer * sizeof(TCHAR));
     stream._bufsiz = 0;
     stream._flag = _IOSTRG | _IOWRT;
     stream._tmpfname = 0;
@@ -63,8 +93,33 @@ _sxprintf(
     va_end(argptr);
 #endif
 
+#if IS_SECAPI
+    /* Check for failure or unterminated string */
+    if ((result < 0) || (result == sizeOfBuffer))
+    {
+        /* Null-terminate the buffer at the end */
+        buffer[sizeOfBuffer-1] = _T('\0');
+
+        /* Check if we can truncate */
+        if (count != _TRUNCATE)
+        {
+            /* We can't, invoke invalid parameter handler */
+            MSVCRT_INVALID_PMT("Buffer is too small");
+
+            /* If we came back, set the buffer to an empty string */
+            *buffer = 0;
+        }
+
+        /* Return failure */
+        return -1;
+    }
+
+    /* Null-terminate the buffer after the string */
+    buffer[result] = _T('\0');
+#else
     /* Only zero terminate if there is enough space left */
     if (stream._cnt >= sizeof(TCHAR)) *(TCHAR*)stream._ptr = _T('\0');
+#endif
 
     return result;
 }