1 files changed, 39 insertions, 37 deletions

diff --git a/src/utils.h b/src/utils.h
index d4011442..93cb9a4a 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -546,50 +546,52 @@ inline char * next_element(char * buf, bool variable = false) {
 
 inline char peek_next_nonws(std::istream& in) {
   char c = in.peek();
-  while (! in.eof() && std::isspace(c)) {
+  while (in.good() && ! in.eof() && std::isspace(c)) {
     in.get(c);
     c = in.peek();
   }
   return c;
 }
 
-#define READ_INTO(str, targ, size, var, cond) {				\
-  char * _p = targ;							\
-  var = str.peek();							\
-  while (! str.eof() && var != '\n' && (cond) && _p - targ < size) {	\
-    str.get(var);							\
-    if (str.eof())							\
-      break;								\
-    if (var == '\\') {							\
-      str.get(var);							\
-      if (in.eof())							\
-	break;								\
-    }									\
-    *_p++ = var;							\
-    var = str.peek();							\
-  }									\
-  *_p = '\0';								\
-}
+#define READ_INTO(str, targ, size, var, cond) {		\
+    char * _p = targ;					\
+    var = str.peek();					\
+    while (str.good() && ! str.eof() && var != '\n' &&	\
+	   (cond) && _p - targ < size) {		\
+      str.get(var);					\
+      if (str.eof())					\
+	break;						\
+      if (var == '\\') {				\
+	str.get(var);					\
+	if (in.eof())					\
+	  break;					\
+      }							\
+      *_p++ = var;					\
+      var = str.peek();					\
+    }							\
+    *_p = '\0';						\
+  }
 
-#define READ_INTO_(str, targ, size, var, idx, cond) {			\
-  char * _p = targ;							\
-  var = str.peek();							\
-  while (! str.eof() && var != '\n' && (cond) && _p - targ < size) {	\
-    str.get(var);							\
-    if (str.eof())							\
-      break;								\
-    idx++;								\
-    if (var == '\\') {							\
-      str.get(var);							\
-      if (in.eof())							\
-	break;								\
-      idx++;								\
-    }									\
-    *_p++ = var;							\
-    var = str.peek();							\
-  }									\
-  *_p = '\0';								\
-}
+#define READ_INTO_(str, targ, size, var, idx, cond) {	\
+    char * _p = targ;					\
+    var = str.peek();					\
+    while (str.good() && ! str.eof() && var != '\n' &&	\
+	   (cond) && _p - targ < size) {		\
+      str.get(var);					\
+      if (str.eof())					\
+	break;						\
+      idx++;						\
+      if (var == '\\') {				\
+	str.get(var);					\
+	if (in.eof())					\
+	  break;					\
+	idx++;						\
+      }							\
+      *_p++ = var;					\
+      var = str.peek();					\
+    }							\
+    *_p = '\0';						\
+  }
 
 } // namespace ledger