diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-10-06 08:35:43 +0200 |
|---|---|---|
| committer | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2018-10-07 14:50:14 +0200 |
| commit | d65afb2c7474f4f7b19aacc74dd3956ee491c60b (patch) | |
| tree | 79c0d2f4a5378a97535e35df18533d09066b1033 /modules/websocket | |
| parent | f8020bc9766e7641fb3e53101bd6d85494e7fa41 (diff) | |
Fix LWSClient connect_to_host string termination.
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.
Diffstat (limited to 'modules/websocket')
| -rw-r--r-- | modules/websocket/lws_client.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/websocket/lws_client.cpp b/modules/websocket/lws_client.cpp index cd814760e6..b3e5f6ffab 100644 --- a/modules/websocket/lws_client.cpp +++ b/modules/websocket/lws_client.cpp @@ -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) |