htop: fix segfault which may occur in some cases
authorLeonid Plyushch <leonid.plyushch@gmail.com>
Tue, 26 Sep 2017 10:36:56 +0000 (13:36 +0300)
committerFredrik Fornwall <fredrik@fornwall.net>
Tue, 26 Sep 2017 13:12:37 +0000 (15:12 +0200)
This already fixed in htop's repo at commit cceab15b9dbdc2f0914c8d479cefa429d1c0daaf

packages/htop/build.sh
packages/htop/fix-sigsegv.patch [new file with mode: 0644]

index cb4ac27..2a3341d 100644 (file)
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Interactive process viewer for Linux"
 # htop checks setlocale() return value for UTF-8 support, so use libandroid-support.
 TERMUX_PKG_DEPENDS="ncurses, libandroid-support"
 TERMUX_PKG_VERSION=2.0.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=http://hisham.hm/htop/releases/${TERMUX_PKG_VERSION}/htop-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=179be9dccb80cee0c5e1a1f58c8f72ce7b2328ede30fb71dcdf336539be2f487
 TERMUX_PKG_BUILD_IN_SRC="yes"
diff --git a/packages/htop/fix-sigsegv.patch b/packages/htop/fix-sigsegv.patch
new file mode 100644 (file)
index 0000000..29721aa
--- /dev/null
@@ -0,0 +1,14 @@
+diff -uNr htop-2.0.2/StringUtils.c htop-2.0.2.mod/StringUtils.c
+--- htop-2.0.2/StringUtils.c   2016-06-20 18:11:13.000000000 +0300
++++ htop-2.0.2.mod/StringUtils.c       2017-09-26 13:33:10.596064441 +0300
+@@ -88,6 +88,10 @@
+ }
+ void String_freeArray(char** s) {
++   if (!s) {
++      return;
++   }
++
+    for (int i = 0; s[i] != NULL; i++) {
+       free(s[i]);
+    }