From: Stefan Monnier Date: Fri, 11 Sep 2009 19:11:07 +0000 (+0000) Subject: (main): Sort scores before trimming them, X-Git-Tag: emacs-pretest-23.1.90~1379 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=24e9e99693f9c9425a41fd1d879ef2827523537c;p=emacs.git (main): Sort scores before trimming them, reported by Jason Feng (bug#4397). --- diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 7970ee5aae2..93cd999509e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2009-09-11 Stefan Monnier + + * update-game-score.c (main): Sort scores before trimming them, + reported by Jason Feng (bug#4397). + 2009-09-09 Glenn Morris * Makefile.in ($(DESTDIR)${archlibdir}): Set umask to world-readable diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index d85f426cbf6..e4ddb79247f 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -254,15 +254,15 @@ main (argc, argv) lose_syserr ("Failed to read scores file"); } push_score (&scores, &scorecount, newscore, user_id, newdata); + sort_scores (scores, scorecount, reverse); /* Limit the number of scores. If we're using reverse sorting, then we should increment the beginning of the array, to skip over the *smallest* scores. Otherwise, we just decrement the number of scores, since the smallest will be at the end. */ if (scorecount > MAX_SCORES) scorecount -= (scorecount - MAX_SCORES); - if (reverse) - scores += (scorecount - MAX_SCORES); - sort_scores (scores, scorecount, reverse); + if (reverse) + scores += (scorecount - MAX_SCORES); if (write_scores (scorefile, scores, scorecount) < 0) { unlock_file (scorefile, lockstate);