diff options
| -rw-r--r-- | main/busybox/top-buffer-overflow.patch | 20 | ||||
| -rw-r--r-- | main/pkgconf/APKBUILD | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/main/busybox/top-buffer-overflow.patch b/main/busybox/top-buffer-overflow.patch new file mode 100644 index 0000000000..14b23c6488 --- /dev/null +++ b/main/busybox/top-buffer-overflow.patch @@ -0,0 +1,20 @@ +--- busybox-1.27.0.orig/procps/top.c ++++ busybox-1.27.0/procps/top.c +@@ -694,10 +694,14 @@ + CALC_STAT(pcpu, (s->pcpu*pcpu_scale + pcpu_half) >> pcpu_shift); + #endif + +- if (s->vsz >= 100000) +- sprintf(vsz_str_buf, "%6ldm", s->vsz/1024); ++ if ((s->vsz / (1024 * 1024)) >= 100000) ++ snprintf(vsz_str_buf, sizeof(vsz_str_buf), "%6ldt", s->vsz/(1024 * 1024 * 1024)); ++ else if ((s->vsz / 1024) >= 100000) ++ snprintf(vsz_str_buf, sizeof(vsz_str_buf), "%6ldg", s->vsz/(1024 * 1024)); ++ else if (s->vsz >= 100000) ++ snprintf(vsz_str_buf, sizeof(vsz_str_buf), "%6ldm", s->vsz/1024); + else +- sprintf(vsz_str_buf, "%7lu", s->vsz); ++ snprintf(vsz_str_buf, sizeof(vsz_str_buf), "%7lu", s->vsz); + /* PID PPID USER STAT VSZ %VSZ [%CPU] COMMAND */ + col = snprintf(line_buf, scr_width, + "\n" "%5u%6u %-8.8s %s%s" FMT diff --git a/main/pkgconf/APKBUILD b/main/pkgconf/APKBUILD index cfc63ced5c..e8d2351db1 100644 --- a/main/pkgconf/APKBUILD +++ b/main/pkgconf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=pkgconf -pkgver=1.3.7 +pkgver=1.3.8 pkgrel=0 pkgdesc="development framework configuration tools" url="https://github.com/pkgconf/pkgconf" @@ -52,4 +52,4 @@ dev() { mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/ } -sha512sums="6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960 pkgconf-1.3.7.tar.xz" +sha512sums="48f5e0960f1923233fc1f6be626c9df2b051311c7b72386a95e895d9328c690760f7f8d66a79467e7c263be5d8109e31a7cc7bee0de93ac8be35c3697e01e159 pkgconf-1.3.8.tar.xz" |