|
26 | 26 |
|
27 | 27 | inline int vsnprintf(char* _Buffer, size_t _BufferCount, const char* _Format, va_list _ArgList)
|
28 | 28 | {
|
29 |
| - // Microsoft's _vsnprintf does not null terminate when writing the entire length. |
30 |
| - int result = _vsnprintf(_Buffer, _BufferCount, _Format, _ArgList); |
31 |
| - _Buffer[_BufferCount - 1] = '\0'; |
32 |
| - return result; |
| 29 | + if (_BufferCount == 0) |
| 30 | + return -1; |
| 31 | + // Microsoft's _vsnprintf does not null terminate when writing the entire length. |
| 32 | + int result = _vsnprintf(_Buffer, _BufferCount, _Format, _ArgList); |
| 33 | + // Deal with errors and edge cases. |
| 34 | + if (result == -1 || (size_t)result == _BufferCount) |
| 35 | + { |
| 36 | + _Buffer[_BufferCount - 1] = '\0'; |
| 37 | + return -1; |
| 38 | + } |
| 39 | + return result; |
33 | 40 | }
|
34 | 41 |
|
35 | 42 | // Yes, this is called vswprintf instead of vsnwprintf
|
36 | 43 | inline int vswprintf(wchar_t* _Buffer, size_t _BufferCount, const wchar_t* _Format, va_list _ArgList)
|
37 | 44 | {
|
38 |
| - // Microsoft's _vsnwprintf does not null terminate when writing the entire length. |
39 |
| - int result = _vsnwprintf(_Buffer, _BufferCount, _Format, _ArgList); |
40 |
| - _Buffer[_BufferCount - 1] = L'\0'; |
41 |
| - return result; |
| 45 | + if (_BufferCount == 0) |
| 46 | + return -1; |
| 47 | + // Microsoft's _vsnwprintf does not null terminate when writing the entire length. |
| 48 | + int result = _vsnwprintf(_Buffer, _BufferCount, _Format, _ArgList); |
| 49 | + // Deal with errors and edge cases. |
| 50 | + if (result == -1 || (size_t)result == _BufferCount) |
| 51 | + { |
| 52 | + _Buffer[_BufferCount - 1] = L'\0'; |
| 53 | + return -1; |
| 54 | + } |
| 55 | + return result; |
42 | 56 | }
|
43 | 57 |
|
44 | 58 | inline int snprintf(char* _Buffer, size_t _BufferCount, const char* _Format, ...)
|
45 | 59 | {
|
46 |
| - va_list _ArgList; |
47 |
| - va_start(_ArgList, _Format); |
48 |
| - int result = vsnprintf(_Buffer, _BufferCount, _Format, _ArgList); |
49 |
| - va_end(_ArgList); |
50 |
| - return result; |
| 60 | + va_list _ArgList; |
| 61 | + va_start(_ArgList, _Format); |
| 62 | + int result = vsnprintf(_Buffer, _BufferCount, _Format, _ArgList); |
| 63 | + va_end(_ArgList); |
| 64 | + return result; |
51 | 65 | }
|
52 | 66 |
|
53 | 67 | // Yes, this is called swprintf instead of snwprintf
|
54 | 68 | inline int swprintf(wchar_t* _Buffer, size_t _BufferCount, const wchar_t* _Format, ...)
|
55 | 69 | {
|
56 |
| - va_list _ArgList; |
57 |
| - va_start(_ArgList, _Format); |
58 |
| - int result = vswprintf(_Buffer, _BufferCount, _Format, _ArgList); |
59 |
| - va_end(_ArgList); |
60 |
| - return result; |
| 70 | + va_list _ArgList; |
| 71 | + va_start(_ArgList, _Format); |
| 72 | + int result = vswprintf(_Buffer, _BufferCount, _Format, _ArgList); |
| 73 | + va_end(_ArgList); |
| 74 | + return result; |
61 | 75 | }
|
62 | 76 |
|
63 | 77 | #endif
|
0 commit comments