X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fciniparser%2Fciniparser.c;h=2b60e409bd7ac7259d2e5245fd457e8087ed7472;hp=d801b736eede829592734fdf4076890205406f34;hb=cfc7d301da49dd2b2ce346b08bf5fbff3acfae67;hpb=85a33135890965218010b79c89e4d3f4905727e3

diff --git a/ccan/ciniparser/ciniparser.c b/ccan/ciniparser/ciniparser.c
index d801b736..2b60e409 100644
--- a/ccan/ciniparser/ciniparser.c
+++ b/ccan/ciniparser/ciniparser.c
@@ -33,7 +33,7 @@
  */
 
 #include <ctype.h>
-#include <ccan/ccan/ciniparser.h>
+#include <ccan/ciniparser/ciniparser.h>
 
 #define ASCIILINESZ      (1024)
 #define INI_INVALID_KEY  ((char*) NULL)
@@ -128,7 +128,6 @@ line_status ciniparser_line(char *input_line, char *section,
 	strcpy(line, strstrip(input_line));
 	len = (int) strlen(line);
 
-	sta = LINE_UNPROCESSED;
 	if (len < 1) {
 		/* Empty line */
 		sta = LINE_EMPTY;
@@ -424,12 +423,10 @@ dictionary *ciniparser_load(const char *ininame)
 		}
 
 		/* Detect multi-line */
-		if (line[len] == '\\') {
+		if (len >= 0 && line[len] == '\\') {
 			/* Multi-line value */
 			last = len;
 			continue;
-		} else {
-			last = 0;
 		}
 
 		switch (ciniparser_line(line, section, key, val)) {