]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-11783: [core] quiet gcc truncation warning
authorSebastian Kemper <sebastian_ml@gmx.net>
Sun, 14 Apr 2019 17:11:58 +0000 (19:11 +0200)
committerSebastian Kemper <sebastian_ml@gmx.net>
Sun, 14 Apr 2019 17:12:03 +0000 (19:12 +0200)
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>
src/switch_core_media.c

index b3209eea548444ff8ca21722dad22215381a312c..ce04e5642ebbc58623de507c45f675a1492a7f9e 100644 (file)
@@ -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));