From 30ce3b4c264c51c98f280e88e23792ff7deb2317 Mon Sep 17 00:00:00 2001
From: Daniel Lange <DLange@git.local>
Date: Fri, 15 Oct 2021 09:03:04 +0200
Subject: New upstream version 3.1.1

---
 freebsd/FreeBSDProcess.c     | 2 +-
 freebsd/FreeBSDProcess.h     | 2 +-
 freebsd/FreeBSDProcessList.c | 4 +++-
 freebsd/FreeBSDProcessList.h | 2 +-
 freebsd/Platform.c           | 4 ++--
 freebsd/Platform.h           | 2 +-
 freebsd/ProcessField.h       | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'freebsd')

diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c
index 9f0386b..3fa55ae 100644
--- a/freebsd/FreeBSDProcess.c
+++ b/freebsd/FreeBSDProcess.c
@@ -1,7 +1,7 @@
 /*
 htop - FreeBSDProcess.c
 (C) 2015 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/freebsd/FreeBSDProcess.h b/freebsd/FreeBSDProcess.h
index 0e0bd59..2443f89 100644
--- a/freebsd/FreeBSDProcess.h
+++ b/freebsd/FreeBSDProcess.h
@@ -3,7 +3,7 @@
 /*
 htop - FreeBSDProcess.h
 (C) 2015 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c
index 48c0648..9bbfccb 100644
--- a/freebsd/FreeBSDProcessList.c
+++ b/freebsd/FreeBSDProcessList.c
@@ -1,7 +1,7 @@
 /*
 htop - FreeBSDProcessList.c
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
@@ -444,6 +444,8 @@ static void FreeBSDProcessList_updateProcessName(kvm_t* kd, const struct kinfo_p
    *at = '\0';
 
    Process_updateCmdline(proc, cmdline, 0, end);
+
+   free(cmdline);
 }
 
 static char* FreeBSDProcessList_readJailName(const struct kinfo_proc* kproc) {
diff --git a/freebsd/FreeBSDProcessList.h b/freebsd/FreeBSDProcessList.h
index ae82205..adc70e4 100644
--- a/freebsd/FreeBSDProcessList.h
+++ b/freebsd/FreeBSDProcessList.h
@@ -3,7 +3,7 @@
 /*
 htop - FreeBSDProcessList.h
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/freebsd/Platform.c b/freebsd/Platform.c
index 527a455..9c88b40 100644
--- a/freebsd/Platform.c
+++ b/freebsd/Platform.c
@@ -1,7 +1,7 @@
 /*
 htop - freebsd/Platform.c
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
@@ -284,7 +284,7 @@ bool Platform_getDiskIO(DiskIOData* data) {
    if (devstat_checkversion(NULL) < 0)
       return false;
 
-   struct devinfo info = { 0 };
+   static struct devinfo info = { 0 };
    struct statinfo current = { .dinfo = &info };
 
    // get number of devices
diff --git a/freebsd/Platform.h b/freebsd/Platform.h
index e7e274c..e99232e 100644
--- a/freebsd/Platform.h
+++ b/freebsd/Platform.h
@@ -3,7 +3,7 @@
 /*
 htop - freebsd/Platform.h
 (C) 2014 Hisham H. Muhammad
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
diff --git a/freebsd/ProcessField.h b/freebsd/ProcessField.h
index 6fba6bc..8ed2746 100644
--- a/freebsd/ProcessField.h
+++ b/freebsd/ProcessField.h
@@ -3,7 +3,7 @@
 /*
 htop - freebsd/ProcessField.h
 (C) 2020 htop dev team
-Released under the GNU GPLv2, see the COPYING file
+Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
-- 
cgit v1.2.3