aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-02-09 18:59:43 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2018-02-09 18:59:43 (GMT)
commit0a61ed7b2813f778fa283d8521a658374aede2a7 (patch)
treed47a2efaa474f0b08b25cbaf83694d4497c11cf1
parent4c44317a7509c91658bd8ea80fcc27d8b2d2a809 (diff)
parent8aa1c6e7f55dadd0388a3b4d6d0e94678058a12c (diff)
downloadandroid_external_toybox-0a61ed7b2813f778fa283d8521a658374aede2a7.zip
android_external_toybox-0a61ed7b2813f778fa283d8521a658374aede2a7.tar.gz
android_external_toybox-0a61ed7b2813f778fa283d8521a658374aede2a7.tar.bz2
Merge remote-tracking branch 'toybox/master' into HEAD am: 4b13881492 am: d21ae1a3cc
am: 8aa1c6e7f5 Change-Id: I84f2c89ff26a8005d28c72dd1316f54c6926bc92
-rw-r--r--toys/posix/ps.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/toys/posix/ps.c b/toys/posix/ps.c
index 8ee68ad..e94902b 100644
--- a/toys/posix/ps.c
+++ b/toys/posix/ps.c
@@ -1417,7 +1417,8 @@ static void top_common(
mix.count = 0;
while (old.count || new.count) {
- struct carveup *otb = old.tb ? *old.tb : 0, *ntb = new.tb ? *new.tb : 0;
+ struct carveup *otb = old.count ? *old.tb : 0,
+ *ntb = new.count ? *new.tb : 0;
// If we just have old for this process, it exited. Discard it.
if (old.count && (!new.count || *otb->slot < *ntb->slot)) {