maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Small hack to avoid runtime error when using ubsan

Browse source 
mbedtls_ssl_read cannot be called with a NULL buffer even if len is 0,
as those are passed to memcpy and compilers doesn't like that.
Always pass a single byte (still len 0 so nothing is actually copied)
This commit is contained in:
Fabio Alessandrelli 2019-02-20 01:34:10 +01:00
parent a056e8dc77
commit 2b8b738391
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/mbedtls/stream_peer_mbed_tls.cpp
View file

@ -270,7 +270,10 @@ void StreamPeerMbedTLS::poll() {
return;
}
int ret = mbedtls_ssl_read(&ssl, NULL, 0);
// We could pass NULL as second parameter, but some behaviour sanitizers doesn't seem to like that.
// Passing a 1 byte buffer to workaround it.
uint8_t byte;
int ret = mbedtls_ssl_read(&ssl, &byte, 0);
if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
// Nothing to read/write (non blocking IO)