sysctl: fix crash -- thanks Steinar Gunderson #423704

diff --git a/NEWS b/NEWS
index 16b3b5ebfb0aebd92504954b2e4bf28a26abc688..12c945a4d3f1b98560a63704ab3c7432c719c155 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ ps: man page less ambiguous
 top: normal exit code should be 0          #341272 #354255
 pgrep: usage error should exit with 2       #413383
 vmstat: use EXIT_FAILURE -- thanks Yoshio Nakamura   #425492
+sysctl: fix crash -- thanks Steinar Gunderson      #423704
 
 procps-3.2.6 --> procps-3.2.7
 

diff --git a/TODO b/TODO
index 0fd07c64d25f10cec6dae77b0f256c99f874f571..3a61258dc417484afaac568135bc97ad22d1af66 100644 (file)
--- a/TODO
+++ b/TODO
@@ -37,13 +37,20 @@ ones get filled in with something logical -- entries must never be deleted!
 
 Add all the stuff Solaris has. This would also replace ptrace.
 
+---------------------- watch --------------------------
+
+Tolerate UTF-8.
+
+Tolerate color, bold, underline, etc. #129334
+
+Tolerate stderr.  #420377 #155227 #225549
+
 ---------------------- w --------------------------
 
 The LOGIN@ column sometimes has a space in it. This makes correct
 scripting difficult.
 
-Verify that DNS control does not give a user the power to specify
-arbitrary data for the FROM column. (could set root's VGA color map!)
+Time formats are demented.
 
 ---------------------- vmstat --------------------------
 

diff --git a/sysctl.c b/sysctl.c
index 0c0e73a61da20cbc72b994da1f8bc4f6a656217b..1470df9a1c9b36b6c58b611b57fe2f565e0f05d8 100644 (file)
--- a/sysctl.c
+++ b/sysctl.c
@@ -135,7 +135,7 @@ static int ReadSetting(const char *restrict const name) {
    }
 
    /* used to open the file */
-   tmpname = malloc(strlen(name)+strlen(PROC_PATH)+1);
+   tmpname = malloc(strlen(name)+strlen(PROC_PATH)+2);
    strcpy(tmpname, PROC_PATH);
    strcat(tmpname, name); 
    slashdot(tmpname+strlen(PROC_PATH),'.','/'); /* change . to / */