diff --git a/lib/x1000-installer/src/xf_flashmap.c b/lib/x1000-installer/src/xf_flashmap.c
index 75cd3c5905..2cde0f1c20 100644
--- a/lib/x1000-installer/src/xf_flashmap.c
+++ b/lib/x1000-installer/src/xf_flashmap.c
@@ -193,6 +193,10 @@ int map_parse_line_cb(int n, char* buf, void* arg)
 
     struct map_parse_args* args = arg;
 
+    /* skip whitespace */
+    while(*buf && isspace(*buf))
+        ++buf;
+
     /* ignore comments and blank lines */
     if(*buf == '#' || *buf == '\0')
         return 0;
diff --git a/lib/x1000-installer/src/xf_stream.c b/lib/x1000-installer/src/xf_stream.c
index 5a0f86123c..b6391b2c8d 100644
--- a/lib/x1000-installer/src/xf_stream.c
+++ b/lib/x1000-installer/src/xf_stream.c
@@ -159,6 +159,9 @@ int xf_stream_read_lines(struct xf_stream* s, char* buf, size_t bufsz,
     size_t pos = 0;
     bool at_eof = false;
 
+    if(bufsz <= 1)
+        return XF_E_LINE_TOO_LONG;
+
     while(!at_eof) {
         bytes_read = xf_stream_read(s, &buf[pos], bufsz - pos - 1);
         if(bytes_read < 0)
@@ -183,20 +186,14 @@ int xf_stream_read_lines(struct xf_stream* s, char* buf, size_t bufsz,
                     else
                         break; /* read ahead to look for newline */
                 } else {
-                    endp = &buf[pos]; /* treat EOF as a newline */
+                    if(startp == &buf[pos])
+                        break; /* nothing left to do */
+                    else
+                        endp = &buf[pos]; /* last line missing a newline -
+                                           * treat EOF as newline */
                 }
             }
 
-            /* skip whitespace */
-            while(*startp && isspace(*startp))
-                ++startp;
-
-            /* ignore blank lines and comment lines */
-            if(*startp == '#' || *startp == '\0') {
-                startp = endp + 1;
-                continue;
-            }
-
             rc = callback(n++, startp, arg);
             if(rc != 0)
                 return rc;