github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

swprintf > _snwprintf 

#397 MinGW treats %s in swprintf as a narrow string specifier while in _snwprintf does not
pull/398/head
OZone 2021-01-21 17:37:34 +03:00 committed by Олег Зонов
parent e4fba0c003
commit aa97e19505
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
echo.c
View File

@ -224,7 +224,7 @@ echo_msg_append(connection_t *c, time_t UNUSED timestamp, const char *msg, BOOL
WriteStatusLog(c, L"GUI> ", L"Error: out of memory while processing echo msg", false); WriteStatusLog(c, L"GUI> ", L"Error: out of memory while processing echo msg", false);
goto out; goto out;
} }
swprintf(s + c->echo_msg.txtlen, len - c->echo_msg.txtlen, L"%s%s", wmsg, eol); _snwprintf(s + c->echo_msg.txtlen, len - c->echo_msg.txtlen, L"%s%s", wmsg, eol);
s[len-1] = L'\0'; s[len-1] = L'\0';
c->echo_msg.text = s; c->echo_msg.text = s;

6
misc.c
View File

@ -469,11 +469,11 @@ wcs_concat2(WCHAR *dest, int len, const WCHAR *src1, const WCHAR *src2, const WC
return; return;
if (src1 && src2 && src1[0] && src2[0]) if (src1 && src2 && src1[0] && src2[0])
n = swprintf(dest, len, L"%s%s%s", src1, sep, src2); n = _snwprintf(dest, len, L"%s%s%s", src1, sep, src2);
else if (src1 && src1[0]) else if (src1 && src1[0])
n = swprintf(dest, len, L"%s", src1); n = _snwprintf(dest, len, L"%s", src1);
else if (src2 && src2[0]) else if (src2 && src2[0])
n = swprintf(dest, len, L"%s", src2); n = _snwprintf(dest, len, L"%s", src2);
if (n < 0 || n >= len) /*swprintf failed */ if (n < 0 || n >= len) /*swprintf failed */
n = 0; n = 0;

4
openvpn.c
View File

@ -1218,7 +1218,7 @@ format_bytecount(wchar_t *buf, size_t len, unsigned long long c)
if (c <= 1024) if (c <= 1024)
{ {
swprintf(buf, len, L"%I64u B", c); _snwprintf(buf, len, L"%I64u B", c);
buf[len-1] = L'\0'; buf[len-1] = L'\0';
return buf; return buf;
} }
@ -1227,7 +1227,7 @@ format_bytecount(wchar_t *buf, size_t len, unsigned long long c)
x /= 1024.0; x /= 1024.0;
s++; s++;
} }
swprintf(buf, len, L"%I64u (%.1f %hs)", c, x, *s); _snwprintf(buf, len, L"%I64u (%.1f %hs)", c, x, *s);
buf[len-1] = L'\0'; buf[len-1] = L'\0';
return buf; return buf;