maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-637: Replace usages of strncat() with guac_strlcat().

Browse Source
This commit is contained in:
Michael Jumper 2018-11-12 15:38:02 -08:00
parent e5c1147cf6
commit 3549da0dd1
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libguac/client.c
View File

@ -30,6 +30,7 @@
#include "guacamole/protocol.h" #include "guacamole/protocol.h"
#include "guacamole/socket.h" #include "guacamole/socket.h"
#include "guacamole/stream.h" #include "guacamole/stream.h"
#include "guacamole/string.h"
#include "guacamole/timestamp.h" #include "guacamole/timestamp.h"
#include "guacamole/user.h" #include "guacamole/user.h"
#include "id.h" #include "id.h"
@ -441,8 +442,13 @@ int guac_client_load_plugin(guac_client* client, const char* protocol) {
} alias; } alias;
/* Add protocol and .so suffix to protocol_lib */ /* Add protocol and .so suffix to protocol_lib */
strncat(protocol_lib, protocol, GUAC_PROTOCOL_NAME_LIMIT-1); guac_strlcat(protocol_lib, protocol, sizeof(protocol_lib));
strcat(protocol_lib, GUAC_PROTOCOL_LIBRARY_SUFFIX); if (guac_strlcat(protocol_lib, GUAC_PROTOCOL_LIBRARY_SUFFIX,
sizeof(protocol_lib)) >= sizeof(protocol_lib)) {
guac_error = GUAC_STATUS_NO_MEMORY;
guac_error_message = "Protocol name is too long";
return -1;
}
/* Load client plugin */ /* Load client plugin */
client_plugin_handle = dlopen(protocol_lib, RTLD_LAZY); client_plugin_handle = dlopen(protocol_lib, RTLD_LAZY);