From 6b2a0901c6c84105b55c42b0f73a076bc5125632 Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Sun, 18 Mar 2018 08:33:14 +0100
Subject: [PATCH] viewer: Fix some compiler warnings (-Wstringop-truncation)
 (#1399)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gcc warnings:

viewer/scrollview.cpp:72:10: warning:
 ‘char* strncpy(char*, const char*, size_t)’ output truncated before
 terminating nul copying as many bytes from a string as its length
 [-Wstringop-truncation]
viewer/scrollview.cpp:118:14: warning:
 ‘char* strncpy(char*, const char*, size_t)’ specified bound depends on
 the length of the source argument [-Wstringop-overflow=]
viewer/scrollview.cpp:746:10: warning:
 ‘char* strncpy(char*, const char*, size_t)’ output truncated before
 terminating nul copying as many bytes from a string as its length
 [-Wstringop-truncation]
viewer/scrollview.cpp:830:10: warning:
 ‘char* strncpy(char*, const char*, size_t)’ output truncated before
 terminating nul copying as many bytes from a string as its length
 [-Wstringop-truncation]

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 viewer/scrollview.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/viewer/scrollview.cpp b/viewer/scrollview.cpp
index 4a9e78eb50..3bcfd2555c 100644
--- a/viewer/scrollview.cpp
+++ b/viewer/scrollview.cpp
@@ -69,8 +69,7 @@ SVEvent* SVEvent::copy() {
   any->command_id = command_id;
   any->counter = counter;
   any->parameter = new char[strlen(parameter) + 1];
-  strncpy(any->parameter, parameter, strlen(parameter));
-  any->parameter[strlen(parameter)] = '\0';
+  strcpy(any->parameter, parameter);
   any->type = type;
   any->x = x;
   any->y = y;
@@ -115,7 +114,7 @@ void* ScrollView::MessageReceiver(void* a) {
 
     if (cur->window != NULL) {
       cur->parameter = new char[strlen(p) + 1];
-      strncpy(cur->parameter, p, strlen(p) + 1);
+      strcpy(cur->parameter, p);
       if (strlen(p) > 0) {  // remove the last \n
         cur->parameter[strlen(p)] = '\0';
       }
@@ -743,8 +742,7 @@ char* ScrollView::ShowInputDialog(const char* msg) {
   // wait till an input event (all others are thrown away)
   ev = AwaitEvent(SVET_INPUT);
   char* p = new char[strlen(ev->parameter) + 1];
-  strncpy(p, ev->parameter, strlen(ev->parameter));
-  p[strlen(ev->parameter)] = '\0';
+  strcpy(p, ev->parameter);
   delete ev;
   return p;
 }
@@ -827,8 +825,7 @@ char* ScrollView::AddEscapeChars(const char* input) {
     lastptr = nextptr;
     nextptr = strchr(nextptr+1, '\'');
   }
-  strncpy(message+pos, lastptr, strlen(lastptr));
-  message[pos+strlen(lastptr)] = '\0';
+  strcpy(message+pos, lastptr);
   return message;
 }