aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2018-02-09 18:49:08 (GMT)
committerandroid-build-merger <android-build-merger@google.com>2018-02-09 18:49:08 (GMT)
commitd21ae1a3cc7c2b8dc74fdacc23034de5ad4de54e (patch)
treed47a2efaa474f0b08b25cbaf83694d4497c11cf1
parent7f1d01238d50e387c99e71e19090b67799100f31 (diff)
parent4b1388149213f13fad17d2932ceb9acdd7273612 (diff)
downloadandroid_external_toybox-d21ae1a3cc7c2b8dc74fdacc23034de5ad4de54e.zip
android_external_toybox-d21ae1a3cc7c2b8dc74fdacc23034de5ad4de54e.tar.gz
android_external_toybox-d21ae1a3cc7c2b8dc74fdacc23034de5ad4de54e.tar.bz2
Merge remote-tracking branch 'toybox/master' into HEAD
am: 4b13881492 Change-Id: I1e2d98073fcbb2b84ab3ccb3eef01f0fdd8c9a99
-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)) {