From: Craig Small <csmall@enc.com.au>
Date: Sat, 2 Jul 2016 05:01:11 +0000 (+1000)
Subject: library: Cater for 32 char device names
X-Git-Tag: v4.0.0~850
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96e6600c8491985de4fc868b868c737d2ff2aaf9;p=procps-ng

library: Cater for 32 char device names

The new library has this boundary set in a define.
Also fixed the off-by-one problem with the buffer and scanf

References:
 commit 1794875ab679809dabb2e1a7d6fa21f23b100d4d
---

diff --git a/proc/diskstat.c b/proc/diskstat.c
index 4d989b79..ebf4a921 100644
--- a/proc/diskstat.c
+++ b/proc/diskstat.c
@@ -34,12 +34,12 @@
 #include "procps-private.h"
 
 #define DISKSTAT_LINE_LEN 1024
-#define DISKSTAT_NAME_LEN 15
+#define DISKSTAT_NAME_LEN 34
 #define DISKSTAT_FILE "/proc/diskstats"
 #define SYSBLOCK_DIR "/sys/block"
 
 struct procps_diskstat_dev {
-    char name[DISKSTAT_NAME_LEN];
+    char name[DISKSTAT_NAME_LEN+1];
     int is_disk;
     unsigned long reads;
     unsigned long reads_merged;
@@ -186,7 +186,7 @@ PROCPS_EXPORT int procps_diskstat_read (
 {
     int retval;
     char buf[DISKSTAT_LINE_LEN];
-    char devname[DISKSTAT_NAME_LEN];
+    char devname[DISKSTAT_NAME_LEN+1];
     struct procps_diskstat_dev *disk;
 
     /* clear/zero structures */