mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:01:41 +03:00
64f28b8f88
Make the helper use `vsnprintf()` internally on all supported Windows toolchains (dropping `_snprintf()` and `snprintf()`), ensure to nul-terminate. Omit the return value to avoid complexity. Use the helper from `mprintf.c` / `out_double()`, from tests/server code and the tests/server-specific build of `curlx_inet_ntop()`, `curlx_strerror()` functions. In the single call (in tests) where the returned length was used previously, determine it with `strlen()`. Refs: https://github.com/libssh2/libssh2/blob/libssh2-1.11.1/src/misc.c#L57-L79 https://learn.microsoft.com/cpp/c-runtime-library/reference/snprintf-snprintf-snprintf-l-snwprintf-snwprintf-l https://learn.microsoft.com/cpp/c-runtime-library/reference/vsnprintf-vsnprintf-vsnprintf-l-vsnwprintf-vsnwprintf-l Assisted-by: Jay Satiro Follow-up tofa8bd1cc09#20761 Follow-up to8ab468c8aa#15997 Closes #20765
49 lines
1.7 KiB
C
49 lines
1.7 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curlx/snprintf.h"
|
|
|
|
#ifdef _WIN32
|
|
#include <stdarg.h>
|
|
|
|
/* Simplified wrapper for the Windows platform to use the correct symbol and
|
|
ensuring null-termination. Omit returning a length to keep it simple. */
|
|
void curlx_win32_snprintf(char *buf, size_t maxlen, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
if(!maxlen)
|
|
return;
|
|
va_start(ap, fmt);
|
|
#if defined(__GNUC__) || defined(__clang__)
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
|
|
#endif
|
|
/* !checksrc! disable BANNEDFUNC 1 */
|
|
(void)vsnprintf(buf, maxlen, fmt, ap);
|
|
#if defined(__GNUC__) || defined(__clang__)
|
|
#pragma GCC diagnostic pop
|
|
#endif
|
|
buf[maxlen - 1] = 0;
|
|
va_end(ap);
|
|
}
|
|
#endif /* _WIN32 */
|