Merge branch '1.0' into HEAD

Conflicts:
	configure.ac
	doc/conf.py

2 files changed, 3 insertions, 6 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 50b1e69..5165476 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,6 @@ libjansson_la_SOURCES = \
 	utf.h \
 	util.h \
 	value.c
-libjansson_la_LDFLAGS = -version-info 0:1:0
+libjansson_la_LDFLAGS = -version-info 0:2:0
 
 AM_CFLAGS = -Wall -Wextra -Werror
diff --git a/src/load.c b/src/load.c
index aa7f99d..d1366f8 100644
--- a/src/load.c
+++ b/src/load.c
@@ -133,10 +133,7 @@ static char stream_get(stream_t *stream, json_error_t *error)
 
         c = stream->buffer[0];
 
-        if(c == EOF && stream->eof(stream->data))
-            return EOF;
-
-        if(c < 0)
+        if(c < 0 && c != EOF)
         {
             /* multi-byte UTF-8 sequence */
             int i, count;
@@ -256,11 +253,11 @@ static void lex_scan_string(lex_t *lex, json_error_t *error)
     lex->value.string = NULL;
     lex->token = TOKEN_INVALID;
 
-    /* skip the " */
     c = lex_get_save(lex, error);
 
     while(c != '"') {
         if(c == EOF) {
+            lex_unget_unsave(lex, c);
             if(lex_eof(lex))
                 error_set(error, lex, "premature end of input");
             goto out;