diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-26 17:26:55 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-02-26 17:26:55 +0000 |
| commit | f5f17b24b3fa8017760ac3d09f22bfc86e52bf57 (patch) | |
| tree | 615baf50f5556d00b750046b0c9cdbf78b2bac2a /system/busybox/top-buffer-overflow.patch | |
| parent | ba5fe57ac3da43128560a805407bc66718ece336 (diff) | |
| parent | 4618f5695b7bd00c07d656e965db11b31f0d8b36 (diff) | |
| download | packages-f5f17b24b3fa8017760ac3d09f22bfc86e52bf57.tar.gz packages-f5f17b24b3fa8017760ac3d09f22bfc86e52bf57.tar.bz2 packages-f5f17b24b3fa8017760ac3d09f22bfc86e52bf57.tar.xz packages-f5f17b24b3fa8017760ac3d09f22bfc86e52bf57.zip | |
Merge branch 'busyborks' into 'master'
Deprecate busybox package due to insane maintanership burden nobody is willing to take up.
See merge request !183
Diffstat (limited to 'system/busybox/top-buffer-overflow.patch')
| -rw-r--r-- | system/busybox/top-buffer-overflow.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/system/busybox/top-buffer-overflow.patch b/system/busybox/top-buffer-overflow.patch deleted file mode 100644 index 14b23c648..000000000 --- a/system/busybox/top-buffer-overflow.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 |