[FFmpeg-cvslog] cmdutils: replace strncpy() with direct assignment

Anton Khirnov git at videolan.org
Tue Mar 16 11:44:56 EET 2021


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Feb 24 11:19:27 2021 +0100| [b334fd39c9c00c739faeece87fa81c980c148a16] | committer: Anton Khirnov

cmdutils: replace strncpy() with direct assignment

Only one character is actually rewritten.

Fixes truncation warnings, such as
warning: ‘strncpy’ output truncated before terminating nul copying 3 bytes from a string of the same length [-Wstringop-truncation]
in gcc 10.2.0

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b334fd39c9c00c739faeece87fa81c980c148a16
---

 fftools/cmdutils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 5e2d3c174b..fe424b6a4c 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -1163,13 +1163,13 @@ static void print_buildconf(int flags, int level)
     // Change all the ' --' strings to '~--' so that
     // they can be identified as tokens.
     while ((conflist = strstr(str, " --")) != NULL) {
-        strncpy(conflist, "~--", 3);
+        conflist[0] = '~';
     }
 
     // Compensate for the weirdness this would cause
     // when passing 'pkg-config --static'.
     while ((remove_tilde = strstr(str, "pkg-config~")) != NULL) {
-        strncpy(remove_tilde, "pkg-config ", 11);
+        remove_tilde[sizeof("pkg-config~") - 2] = ' ';
     }
 
     splitconf = strtok(str, "~");



More information about the ffmpeg-cvslog mailing list