xsel

commit 24bee9c7f4dc887eabb2783f21cbf9734d723d72
parent 9bfc13d64b5acb92c6648c696a9d9260fcbecc65
Author: Conrad Parker <conrad@metadecks.org>
Date:   Fri, 17 May 2019 09:20:04 +0900

Merge pull request #32 from ony/master

Avoid extra char copy in strncpy
Diffstat:
M
xsel.c
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/xsel.c b/xsel.c
@@ -233,7 +233,8 @@ static char *
 get_atom_name (Atom atom)
 {
   char * ret;
-  static char atom_name[MAXLINE+1];
+  static char atom_name[MAXLINE+2];  /* unused extra char to avoid
+                                        string-op-truncation warning */
 
   if (atom == None) return "None";
   if (atom == XA_STRING) return "STRING";
@@ -249,7 +250,7 @@ get_atom_name (Atom atom)
   if (atom == utf8_atom) return "UTF8_STRING";
 
   ret = XGetAtomName (display, atom);
-  strncpy (atom_name, ret, sizeof (atom_name));
+  strncpy (atom_name, ret, MAXLINE+1);
   if (atom_name[MAXLINE] != '\0')
     {
       atom_name[MAXLINE-3] = '.';
@@ -328,7 +329,7 @@ static char *
 _xs_strncpy (char * dest, const char * src, size_t n)
 {
   if (n > 0) {
-    strncpy (dest, src, n);
+    strncpy (dest, src, n-1);
     dest[n-1] = '\0';
   }
   return dest;