From b40e63de4ec7bb628febdbf0fd5efc788d348d3b Mon Sep 17 00:00:00 2001
From: Sergey Svishchev <shattered@users.noreply.github.com>
Date: Thu, 9 Mar 2017 17:20:54 -0800
Subject: [PATCH] VAX: fix CID: 1415411, 1415414-1415417, 1415535 "Buffer not
 null terminated"

Pass buffer size minus one to strncpy()
---
 VAX/vax610_sysdev.c | 2 +-
 VAX/vax730_sys.c    | 2 +-
 VAX/vax750_cmi.c    | 2 +-
 VAX/vax780_sbi.c    | 2 +-
 VAX/vax860_abus.c   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VAX/vax610_sysdev.c b/VAX/vax610_sysdev.c
index f7417ef1..eb40e8d3 100644
--- a/VAX/vax610_sysdev.c
+++ b/VAX/vax610_sysdev.c
@@ -371,7 +371,7 @@ if (r != SCPE_OK) {                                     /* error? */
         }
     return r;
     }
-strncpy (cpu_boot_cmd, ptr, CBUFSIZE);                  /* save for reboot */
+strncpy (cpu_boot_cmd, ptr, CBUFSIZE-1);                /* save for reboot */
 return run_cmd (flag, "CPU");
 }
 
diff --git a/VAX/vax730_sys.c b/VAX/vax730_sys.c
index b8ce8b6f..d3575d95 100644
--- a/VAX/vax730_sys.c
+++ b/VAX/vax730_sys.c
@@ -478,7 +478,7 @@ if (r != SCPE_OK) {                                     /* error? */
         }
     return r;
     }
-strncpy (cpu_boot_cmd, ptr, CBUFSIZE);                  /* save for reboot */
+strncpy (cpu_boot_cmd, ptr, CBUFSIZE-1);                /* save for reboot */
 return run_cmd (flag, "CPU");
 }
 
diff --git a/VAX/vax750_cmi.c b/VAX/vax750_cmi.c
index b547730d..7c9d27d5 100644
--- a/VAX/vax750_cmi.c
+++ b/VAX/vax750_cmi.c
@@ -617,7 +617,7 @@ if (r != SCPE_OK) {                                     /* error? */
         }
     return r;
     }
-strncpy (cpu_boot_cmd, ptr, CBUFSIZE);                  /* save for reboot */
+strncpy (cpu_boot_cmd, ptr, CBUFSIZE-1);                /* save for reboot */
 return run_cmd (flag, "CPU");
 }
 
diff --git a/VAX/vax780_sbi.c b/VAX/vax780_sbi.c
index 339a8a02..f5d3e6a5 100644
--- a/VAX/vax780_sbi.c
+++ b/VAX/vax780_sbi.c
@@ -630,7 +630,7 @@ if (r != SCPE_OK) {                                     /* error? */
         }
     return r;
     }
-strncpy (cpu_boot_cmd, ptr, CBUFSIZE);                  /* save for reboot */
+strncpy (cpu_boot_cmd, ptr, CBUFSIZE-1);                /* save for reboot */
 return run_cmd (flag, "CPU");
 }
 
diff --git a/VAX/vax860_abus.c b/VAX/vax860_abus.c
index af7519de..735d3601 100644
--- a/VAX/vax860_abus.c
+++ b/VAX/vax860_abus.c
@@ -693,7 +693,7 @@ if (r != SCPE_OK) {                                     /* error? */
         }
     return r;
     }
-strncpy (cpu_boot_cmd, ptr, CBUFSIZE);                  /* save for reboot */
+strncpy (cpu_boot_cmd, ptr, CBUFSIZE-1);                /* save for reboot */
 return run_cmd (flag, "CPU");
 }