winsftp.c needs winsecur.h for process protection.

[PuTTY.git] / misc.c

diff --git a/misc.c b/misc.c
index 618ca2971d0646fc7a889e4a65bd97edbad0b27f..5ff403d6b495f60ef9f8a7daf7a7075ef28b5693 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -412,7 +412,7 @@ char *dupvprintf(const char *fmt, va_list ap)
     size = 512;
 
     while (1) {
-#ifdef _WINDOWS
+#if defined _WINDOWS && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */
 #define vsnprintf _vsnprintf
 #endif
 #ifdef va_copy
@@ -460,7 +460,7 @@ char *fgetline(FILE *fp)
     int size = 512, len = 0;
     while (fgets(ret + len, size - len, fp)) {
        len += strlen(ret + len);
-       if (ret[len-1] == '\n')
+       if (len > 0 && ret[len-1] == '\n')
            break;                     /* got a newline, we're done */
        size = len + 512;
        ret = sresize(ret, size, char);