godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix LWSClient connect_to_host string termination.

Browse Source 
Coming from strncpy might get you a non-NULL terminated buffer.
The solution, if you accept trunction, is to give one less byte to
strncpy and manually set the last char in the buffer to '\0'.
If the source string is shorter, than the buffer is padded with '\0'
automatically.
This commit is contained in:
Fabio Alessandrelli 2018-10-06 08:35:43 +02:00
parent f8020bc976
commit d65afb2c74
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/websocket/lws_client.cpp
View File

@ -80,9 +80,12 @@ Error LWSClient::connect_to_host(String p_host, String p_path, uint16_t p_port,
char hbuf[1024];
char pbuf[2048];
String addr_str = (String)addr;
strncpy(abuf, addr_str.ascii().get_data(), 1024);
strncpy(hbuf, p_host.utf8().get_data(), 1024);
strncpy(pbuf, p_path.utf8().get_data(), 2048);
strncpy(abuf, addr_str.ascii().get_data(), 1023);
abuf[1023] = '\0';
strncpy(hbuf, p_host.utf8().get_data(), 1023);
hbuf[1023] = '\0';
strncpy(pbuf, p_path.utf8().get_data(), 2047);
pbuf[2047] = '\0';
i.context = context;
if (p_protocols.size() > 0)