Bug#414784: putty-tools: [PUTTYGEN] [PATCH] requires a final newline

[Justin Pryzby]

user [EMAIL PROTECTED]
usertag 414784 puttygen
tag 414784 patch
thanks

--- putty-0.60.orig/sshpubk.c
+++ putty-0.60/sshpubk.c
@@ -495,16 +495,12 @@
 
     while (1) {
        c = fgetc(fp);
-       if (c == '\r' || c == '\n') {
+       if (c == '\r' || c == '\n' || c == EOF) {
            c = fgetc(fp);
            if (c != '\r' && c != '\n' && c != EOF)
                ungetc(c, fp);
            return text;
        }
-       if (c == EOF) {
-           sfree(text);
-           return NULL;
-       }
        if (len + 1 >= size) {
            size += 128;
            text = sresize(text, size, char);


--- putty-0.60.orig/sshpubk.c
+++ putty-0.60/sshpubk.c
@@ -495,16 +495,12 @@
 
     while (1) {
        c = fgetc(fp);
-       if (c == '\r' || c == '\n') {
+       if (c == '\r' || c == '\n' || c == EOF) {
            c = fgetc(fp);
            if (c != '\r' && c != '\n' && c != EOF)
                ungetc(c, fp);
            return text;
        }
-       if (c == EOF) {
-           sfree(text);
-           return NULL;
-       }
        if (len + 1 >= size) {
            size += 128;
            text = sresize(text, size, char);