From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Sun, 14 Apr 2019 17:11:58 +0000 (+0200)
Subject: FS-11783: [core] quiet gcc truncation warning
X-Git-Tag: v1.8.7~1^2~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e114c6382e68824d4498f62562714860d20804e2;p=thirdparty%2Ffreeswitch.git

FS-11783: [core] quiet gcc truncation warning

With -Wstringop-truncation gcc warns about calls to bounded string
manipulation function "strncpy" that may either truncate the copied
string or leave the destination unchanged. To avoid the warning when the
result is not expected to be NUL-terminated, it is suggested to call
"memcpy" instead.

src/switch_core_media.c: In function 'switch_core_media_patch_sdp':
src/switch_core_media.c:11854:4: error: 'strncpy' output truncated before terminating nul copying 2 bytes from a string of the same length [-Werror=stringop-truncation]
    strncpy(q, strchr(a_engine->adv_sdp_ip, ':') ? "6 " : "4 ", 2);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

This commit follows gcc's recommendation.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index b3209eea54..ce04e5642e 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -11858,7 +11858,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
 			strncpy(q, p, 7);
 			p += 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;
 			q +=2;
 			strncpy(q, a_engine->adv_sdp_ip, strlen(a_engine->adv_sdp_ip));