# HG changeset patch # User Colin Walters # Date 1017998337 0 # Node ID 21e4d76a9e8a3cde5d2b6d51b8666bf565321fe5 # Parent 0c1446851ed2785ea29aa4adadb630afc9332afb Actually make previous changes work (oops). diff -r 0c1446851ed2 -r 21e4d76a9e8a lib-src/update-game-score.c --- a/lib-src/update-game-score.c Fri Apr 05 08:58:12 2002 +0000 +++ b/lib-src/update-game-score.c Fri Apr 05 09:18:57 2002 +0000 @@ -189,6 +189,7 @@ ; if (c == EOF) return -1; + ungetc(c, f); #ifdef HAVE_GETDELIM { int count = 0; @@ -200,7 +201,9 @@ { int unameread = 0; int unamelen = 30; - char *username; + char *username = malloc(unamelen); + if (!username) + return -1; while ((c = getc(f)) != EOF && !isspace(c)) @@ -213,6 +216,9 @@ username[unameread] = c; unameread++; } + if (c == EOF) + return -1; + username[unameread] = '\0'; score->username = username; } #endif @@ -231,7 +237,8 @@ char *buf = malloc(len); if (!buf) return -1; - while ((c = getc(f)) != EOF) + while ((c = getc(f)) != EOF + && c != '\n') { if (cur >= len-1) { @@ -242,7 +249,6 @@ cur++; } score->data = buf; - score->data[cur+1] = '\0'; } #endif /* Trim the newline */