+2014-01-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ Fix miscellaneous update-game-score bugs.
+ * configure.ac (difftime): Remove.
+
2014-01-20 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
+2014-01-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ Fix miscellaneous update-game-score bugs.
+ * update-game-score.c (difftime) [!HAVE_DIFFTIME]: Remove.
+ (read_score) [HAVE_GETDELIM]: Don't access uninitialized storage.
+ (read_scores, write_scores): Check for fclose failure.
+ (write_scores): Use fchmod, not chmod, to avoid a race.
+ (lock_file): Fix test for out-of-date lock file; it was reversed.
+ Use ordinary subtraction rather than difftime; since we're already
+ assuming POSIX we don't need to worry about the possibility of
+ time_t being a magic cookie.
+
2014-01-19 Paul Eggert <eggert@cs.ucla.edu>
update-game-score fixes for -m and integer overflow (Bug#16428)
#define MAX_ATTEMPTS 5
#define MAX_DATA_LEN 1024
-#ifndef HAVE_DIFFTIME
-/* OK on POSIX (time_t is arithmetic type) modulo overflow in subtraction. */
-#define difftime(t1, t0) (double)((t1) - (t0))
-#endif
-
static _Noreturn void
usage (int err)
{
#ifdef HAVE_GETDELIM
{
size_t count = 0;
+ score->username = 0;
if (getdelim (&score->username, &count, ' ', f) < 1
|| score->username == NULL)
return -1;
while ((readval = read_score (f, &entry)) == 0)
if (push_score (&ret, &scorecount, &cursize, &entry) < 0)
return -1;
- if (readval > 0)
+ if (readval > 0 && fclose (f) == 0)
{
*count = scorecount;
*alloc = cursize;
*scores = ret;
retval = 0;
}
- fclose (f);
return retval;
}
fd = mkostemp (tempfile, 0);
if (fd < 0)
return -1;
+ if (fchmod (fd, 0644) != 0)
+ return -1;
f = fdopen (fd, "w");
if (! f)
return -1;
scores[i].score, scores[i].username, scores[i].data)
< 0)
return -1;
- fclose (f);
- if (rename (tempfile, filename) < 0)
+ if (fclose (f) != 0)
return -1;
- if (chmod (filename, 0644) < 0)
+ if (rename (tempfile, filename) != 0)
return -1;
return 0;
}
*state = lockpath;
trylock:
attempts++;
- /* If the lock is over an hour old, delete it. */
+ /* If the lock is over an hour old, delete it. */
if (stat (lockpath, &buf) == 0
- && (difftime (buf.st_ctime, time (NULL) > 60*60)))
+ && 60 * 60 < time (0) - buf.st_ctime)
unlink (lockpath);
fd = open (lockpath, O_CREAT | O_EXCL, 0600);
if (fd < 0)