(main): Sort scores before trimming them,

reported by Jason Feng <jfeng@ozbert.com> (bug#4397).

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 7970ee5aae2baba2ccdd0fa277dd2ef0dc28e2c2..93cd999509e32121f991acfa638734cab2d4f8b4 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * update-game-score.c (main): Sort scores before trimming them,
+       reported by Jason Feng <jfeng@ozbert.com> (bug#4397).
+
 2009-09-09  Glenn Morris  <rgm@gnu.org>
 
        * 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 d85f426cbf68435f800d9959e29c7ca8f4f77012..e4ddb79247f6f1504f1daad9f193d667477026bb 100644 (file)
--- 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);