FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.0' into HEAD

Browse Source 
Conflicts:
	configure.ac
	doc/conf.py
This commit is contained in:
Petri Lehtinen 2009-09-08 17:02:39 +03:00
commit 55d2566539
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,3 +1,7 @@
Version 1.0.2, released 2009-09-08
* Handle EOF correctly in decoder
Version 1.0.1, released 2009-09-04
* Fixed broken json_is_boolean()

2
Makefile.am
View File

@ -1,2 +1,2 @@
EXTRA_DIST = LICENSE README.rst
EXTRA_DIST = CHANGES LICENSE README.rst
SUBDIRS = doc src test

2
configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.63])
AC_INIT([jansson], [1.0.1+], [petri@digip.org])
AC_INIT([jansson], [1.0.2+], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])

2
doc/conf.py
View File

@ -52,7 +52,7 @@ copyright = u'2009, Petri Lehtinen'
# The short X.Y version.
version = '1.0'
# The full version, including alpha/beta/rc tags.
release = '1.0.1+'
release = '1.0.2+'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

2
src/Makefile.am
View File

@ -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

7
src/load.c
View File

@ -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;