generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

As pointed out, feof() will always fail after a rewind

Browse Source
This commit is contained in:
James Housley 2006-11-13 15:10:38 +00:00
parent bebd14a011
commit 1e889ca947
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/userauth.c
View File

@ -254,11 +254,11 @@ static int libssh2_file_read_publickey(LIBSSH2_SESSION *session, unsigned char *
return -1; return -1;
} }
while (!feof(fd) && (c = fgetc(fd)) != '\r' && c != '\n') pubkey_len++; while (!feof(fd) && (c = fgetc(fd)) != '\r' && c != '\n') pubkey_len++;
rewind(fd);
if (feof(fd)) { if (feof(fd)) {
/* the last character was EOF */ /* the last character was EOF */
pubkey_len--; pubkey_len--;
} }
rewind(fd);
if (pubkey_len <= 1) { if (pubkey_len <= 1) {
libssh2_error(session, LIBSSH2_ERROR_FILE, "Invalid data in public key file", 0); libssh2_error(session, LIBSSH2_ERROR_FILE, "Invalid data in public key file", 0);