提交 10a52ebe authored 作者: Mike Jerris's avatar Mike Jerris

Merge pull request #1711 in FS/freeswitch from…

Merge pull request #1711 in FS/freeswitch from ~SEBASTIAN/freeswitch:bugfix/FS-11783-address-gcc8-warnings to master

* commit '3ca75eb8':
  FS-11783: [mod_say_ja] quiet overflow warning
  FS-11783: [core] quiet gcc truncation warning
...@@ -367,7 +367,8 @@ static switch_status_t ja_say_time(switch_core_session_t *session, char *tosay, ...@@ -367,7 +367,8 @@ static switch_status_t ja_say_time(switch_core_session_t *session, char *tosay,
say_file("time/pm.wav"); say_file("time/pm.wav");
} }
say_file("time/hour-%d.wav", tm.tm_hour); say_file("time/hour-%d.wav", tm.tm_hour);
if (tm.tm_min > 10) { /* tm_min is always < 60 - this is just to silence gcc 8 warning */
if (tm.tm_min > 10 && tm.tm_min < 60) {
int temp; int temp;
char tch[1+1]; char tch[1+1];
mod_min = tm.tm_min % 10; mod_min = tm.tm_min % 10;
......
...@@ -11918,7 +11918,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session) ...@@ -11918,7 +11918,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
strncpy(q, p, 7); strncpy(q, p, 7);
p += 7; p += 7;
q += 7; q += 7;
strncpy(q, strchr(a_engine->adv_sdp_ip, ':') ? "6 " : "4 ", 2); memcpy(q, strchr(a_engine->adv_sdp_ip, ':') ? "6 " : "4 ", 2);
p +=2; p +=2;
q +=2; q +=2;
strncpy(q, a_engine->adv_sdp_ip, strlen(a_engine->adv_sdp_ip)); strncpy(q, a_engine->adv_sdp_ip, strlen(a_engine->adv_sdp_ip));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论