From abde630feab06adfc6b2773bf03b4c699861e9c5 Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Wed, 12 Dec 2018 05:27:06 +0000 Subject: [PATCH] FS-11345: Fixed Werror=stringop-truncation for mod_opus Fixed Werror=format-truncation on sofia-sip/libsofia-sip-ua/tport Fixed Werror=format-truncation on mod/endpoints/mod_verto Fixed unused-but-set-variable in mod_lua Fixed Werror=format-truncation on libs/sofia-sip/libsofia-sip-ua/tport Fixed Wunused-variable Wmaybe-uninitialized on mod_soundtouch Fixed Wliteral-suffix for libs/unimrcp --- libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c | 4 ++-- libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 4 ++-- libs/unimrcp/libs/apr-toolkit/include/apt_log.h | 6 +++--- libs/unimrcp/platforms/umc/src/umcconsole.cpp | 2 +- libs/unimrcp/platforms/umc/src/umcscenario.cpp | 2 +- src/mod/applications/mod_soundtouch/mod_soundtouch.cpp | 4 ++-- src/mod/codecs/mod_opus/mod_opus.c | 10 +++++----- src/mod/endpoints/mod_verto/ws.c | 4 ++-- src/mod/languages/mod_lua/mod_lua.cpp | 3 +-- 9 files changed, 19 insertions(+), 20 deletions(-) diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c index 8d7beeeeb0..1c889da5f6 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c @@ -315,7 +315,7 @@ int tport_open_log(tport_master_t *mr, tagi_t *tags) /** Create log stamp */ void tport_stamp(tport_t const *self, msg_t *msg, - char stamp[128], char const *what, + char stamp[512], char const *what, size_t n, char const *via, su_time_t now) { @@ -357,7 +357,7 @@ void tport_stamp(tport_t const *self, msg_t *msg, su_inet_ntop(su->su_family, SU_ADDR(su), name, sizeof(name)); - snprintf(stamp, 128, + snprintf(stamp, 144, "%s "MOD_ZU" bytes %s %s/[%s]:%u%s%s at %02u:%02u:%02u.%06lu:\n", what, (size_t)n, via, self->tp_name->tpn_proto, name, ntohs(su->su_port), label[0] ? label : "", comp, diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c index ced491d829..8d6de2909b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c @@ -254,10 +254,10 @@ int ws_handshake(wsh_t *wsh) char version[5] = ""; char proto[256] = ""; char proto_buf[384] = ""; - char input[256] = ""; + char input[512] = ""; unsigned char output[SHA1_HASH_SIZE] = ""; char b64[256] = ""; - char respond[512] = ""; + char respond[1024] = ""; ssize_t bytes; char *p, *e = 0; diff --git a/libs/unimrcp/libs/apr-toolkit/include/apt_log.h b/libs/unimrcp/libs/apr-toolkit/include/apt_log.h index a9ec8d91c6..9e022c3163 100644 --- a/libs/unimrcp/libs/apr-toolkit/include/apt_log.h +++ b/libs/unimrcp/libs/apr-toolkit/include/apt_log.h @@ -58,11 +58,11 @@ APT_BEGIN_EXTERN_C /** Format to log string identifiers and resources */ #define APT_SIDRES_FMT "<%s@%s>" /** Format to log pointers and identifiers */ -#define APT_PTRSID_FMT APT_PTR_FMT" "APT_SID_FMT +#define APT_PTRSID_FMT APT_PTR_FMT" " APT_SID_FMT /** Format to log pointers and identifiers */ -#define APT_NAMESID_FMT "%s "APT_SID_FMT +#define APT_NAMESID_FMT "%s " APT_SID_FMT /** Format to log names, identifiers and resources */ -#define APT_NAMESIDRES_FMT "%s "APT_SIDRES_FMT +#define APT_NAMESIDRES_FMT "%s " APT_SIDRES_FMT /** Priority of log messages ordered from highest priority to lowest (rfc3164) */ typedef enum { diff --git a/libs/unimrcp/platforms/umc/src/umcconsole.cpp b/libs/unimrcp/platforms/umc/src/umcconsole.cpp index 3165854082..a065208a91 100644 --- a/libs/unimrcp/platforms/umc/src/umcconsole.cpp +++ b/libs/unimrcp/platforms/umc/src/umcconsole.cpp @@ -246,7 +246,7 @@ void UmcConsole::Usage() { printf( "\n" - " * "UNI_COPYRIGHT"\n" + " * " UNI_COPYRIGHT"\n" " *\n" UNI_LICENSE"\n" "\n" diff --git a/libs/unimrcp/platforms/umc/src/umcscenario.cpp b/libs/unimrcp/platforms/umc/src/umcscenario.cpp index 085aa755fb..d9300dcf3c 100644 --- a/libs/unimrcp/platforms/umc/src/umcscenario.cpp +++ b/libs/unimrcp/platforms/umc/src/umcscenario.cpp @@ -221,7 +221,7 @@ const char* UmcScenario::LoadFileContent(const char* pFileName, apr_size_t& size size = (apr_size_t)finfo.size; char* pContent = (char*) apr_palloc(pool,size+1); - apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Load File Content size [%"APR_SIZE_T_FMT" bytes] %s",size,pFilePath); + apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Load File Content size [%" APR_SIZE_T_FMT" bytes] %s",size,pFilePath); if(apr_file_read(pFile,pContent,&size) != APR_SUCCESS) { apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Read Content %s",pFilePath); diff --git a/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp b/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp index 734a09ba4e..fc2843440b 100644 --- a/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp +++ b/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp @@ -252,7 +252,8 @@ SWITCH_STANDARD_APP(soundtouch_start_function) char *argv[6]; int argc; char *lbuf = NULL; - int x, n; + int x; + int n=0; if ((bug = (switch_media_bug_t *) switch_channel_get_private(channel, "_soundtouch_"))) { if (!zstr(data) && !strcasecmp(data, "stop")) { @@ -334,7 +335,6 @@ SWITCH_STANDARD_API(soundtouch_api_function) char *argv[10] = { 0 }; char *uuid = NULL; char *action = NULL; - char *lbuf = NULL; int x, n; if (zstr(cmd)) { diff --git a/src/mod/codecs/mod_opus/mod_opus.c b/src/mod/codecs/mod_opus/mod_opus.c index b06d8fa188..1125a27d17 100644 --- a/src/mod/codecs/mod_opus/mod_opus.c +++ b/src/mod/codecs/mod_opus/mod_opus.c @@ -207,19 +207,19 @@ static uint32_t switch_opus_encoder_set_audio_bandwidth(OpusEncoder *encoder_obj static switch_bool_t switch_opus_show_audio_bandwidth(int audiobandwidth,char *audiobandwidth_str) { if (audiobandwidth == OPUS_BANDWIDTH_NARROWBAND) { - strncpy(audiobandwidth_str, "NARROWBAND",10); + strncpy(audiobandwidth_str, "NARROWBAND",11); return SWITCH_TRUE; } else if (audiobandwidth == OPUS_BANDWIDTH_MEDIUMBAND) { - strncpy(audiobandwidth_str, "MEDIUMBAND",10); + strncpy(audiobandwidth_str, "MEDIUMBAND",11); return SWITCH_TRUE; } else if (audiobandwidth == OPUS_BANDWIDTH_WIDEBAND) { - strncpy(audiobandwidth_str,"WIDEBAND",8); + strncpy(audiobandwidth_str,"WIDEBAND",9); return SWITCH_TRUE; } else if (audiobandwidth == OPUS_BANDWIDTH_SUPERWIDEBAND) { - strncpy(audiobandwidth_str, "SUPERWIDEBAND",13); + strncpy(audiobandwidth_str, "SUPERWIDEBAND",14); return SWITCH_TRUE; } else if (audiobandwidth == OPUS_BANDWIDTH_FULLBAND) { - strncpy(audiobandwidth_str, "FULLBAND",8); + strncpy(audiobandwidth_str, "FULLBAND",9); return SWITCH_TRUE; } return SWITCH_FALSE; diff --git a/src/mod/endpoints/mod_verto/ws.c b/src/mod/endpoints/mod_verto/ws.c index d92fd0bcea..86c73c18fa 100644 --- a/src/mod/endpoints/mod_verto/ws.c +++ b/src/mod/endpoints/mod_verto/ws.c @@ -254,10 +254,10 @@ int ws_handshake(wsh_t *wsh) char version[5] = ""; char proto[256] = ""; char proto_buf[384] = ""; - char input[256] = ""; + char input[512] = ""; unsigned char output[SHA1_HASH_SIZE] = ""; char b64[256] = ""; - char respond[512] = ""; + char respond[1024] = ""; ssize_t bytes; char *p, *e = 0; diff --git a/src/mod/languages/mod_lua/mod_lua.cpp b/src/mod/languages/mod_lua/mod_lua.cpp index 47d14c6d48..63aaf25fc0 100644 --- a/src/mod/languages/mod_lua/mod_lua.cpp +++ b/src/mod/languages/mod_lua/mod_lua.cpp @@ -118,7 +118,6 @@ int docall(lua_State * L, int narg, int nresults, int perror, int fatal) static lua_State *lua_init(void) { lua_State *L = luaL_newstate(); - int error = 0; if (L) { const char *buff = "os.exit = function() freeswitch.consoleLog(\"err\", \"Surely you jest! exiting is a bad plan....\\n\") end"; @@ -127,7 +126,7 @@ static lua_State *lua_init(void) luaopen_freeswitch(L); lua_gc(L, LUA_GCRESTART, 0); lua_atpanic(L, panic); - error = luaL_loadbuffer(L, buff, strlen(buff), "line") || docall(L, 0, 0, 0, 1); + luaL_loadbuffer(L, buff, strlen(buff), "line") || docall(L, 0, 0, 0, 1); } return L; }