Merge branch 'master' into websocket_fix

diff --cc apps/examples/websocket/websocket_main.c
index 47893f0,6cf9b2c..dcedbcd
--- 1/apps/examples/websocket/websocket_main.c
--- 2/apps/examples/websocket/websocket_main.c
+++ b/apps/examples/websocket/websocket_main.c
@@@ -749,17 -747,9 +749,18 @@@ int websocket_main(int argc, char *argv
                        goto error_with_input;
                }
  
 -              strncpy(input->server_ip, argv[2], 19);
 -              strncpy(input->server_port, argv[3], 7);
 -              strncpy(input->path, argv[4], 31);
 +              int addr_len = strlen(argv[2]);
 +              int port_len = strlen(argv[3]);
 +              int path_len = strlen(argv[4]);
 +
 +              if (addr_len > WEBSOCKET_EXAMPLE_ADDR_LEN || port_len > WEBSOCKET_EXAMPLE_PORT_LEN
 +                      || path_len > WEBSOCKET_EXAMPLE_PATH_LEN) {
 +                      goto error_with_input;
 +              }
 +              strncpy(input->server_ip, argv[2], addr_len + 1);
 +              strncpy(input->server_port, argv[3], port_len + 1);
 +              strncpy(input->path, argv[4], path_len + 1);
++
                input->tls_mode = atoi(argv[5]);
                input->size = atoi(argv[6]);
                input->num = atoi(argv[7]);