organicmaps/jansson
13
Fork 0
mirror of https://github.com/akheron/jansson.git synced 2025-04-06 05:55:05 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge branch '1.0'

Browse source 
Conflicts:
	configure.ac
	doc/conf.py
This commit is contained in:
Petri Lehtinen 2009-10-11 21:51:54 +03:00
commit ca7703fbd1
6 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,3 +1,10 @@
Version 1.0.4, released 2009-10-11
* Relax Autoconf version requirement to 2.59
* Make Jansson compile on platforms where plain char is unsigned
* Fix API tests for object
Version 1.0.3, released 2009-09-14
* Check for integer and real overflows and underflows in decoder

4
configure.ac
View file

@ -1,5 +1,5 @@
AC_PREREQ([2.63])
AC_INIT([jansson], [1.0.3+], [petri@digip.org])
AC_PREREQ([2.59])
AC_INIT([jansson], [1.0.4+], [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.3+'
release = '1.0.4+'
# 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:3:0
libjansson_la_LDFLAGS = -version-info 0:4:0
AM_CFLAGS = -Wall -Wextra -Werror

2
src/dump.c
View file

@ -70,7 +70,7 @@ static int dump_string(const char *str, dump_func dump, void *data)
char seq[7];
int length;
while(*end && *end != '\\' && *end != '"' && (*end < 0 || *end > 0x1F))
while(*end && *end != '\\' && *end != '"' && (unsigned char)*end > 0x1F)
end++;
if(end != str) {

8
src/load.c
View file

@ -134,7 +134,7 @@ static char stream_get(stream_t *stream, json_error_t *error)
c = stream->buffer[0];
if(c < 0 && c != EOF)
if((unsigned char)c >= 0x80 && c != (char)EOF)
{
/* multi-byte UTF-8 sequence */
int i, count;
@ -257,14 +257,14 @@ static void lex_scan_string(lex_t *lex, json_error_t *error)
c = lex_get_save(lex, error);
while(c != '"') {
if(c == EOF) {
if(c == (char)EOF) {
lex_unget_unsave(lex, c);
if(lex_eof(lex))
error_set(error, lex, "premature end of input");
goto out;
}
else if(0 <= c && c <= 0x1F) {
else if((unsigned char)c <= 0x1F) {
/* control character */
lex_unget_unsave(lex, c);
if(c == '\n')
@ -518,7 +518,7 @@ static int lex_scan(lex_t *lex, json_error_t *error)
c = lex_get(lex, error);
}
if(c == EOF) {
if(c == (char)EOF) {
if(lex_eof(lex))
lex->token = TOKEN_EOF;
else