projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++: Untabify, reindent, delete trailing whitespace
[jansson.git]
/
src
/
load.c
diff --git
a/src/load.c
b/src/load.c
index
f004525
..
4d08139
100644
(file)
--- a/
src/load.c
+++ b/
src/load.c
@@
-14,6
+14,7
@@
#include <string.h>
#include <stdarg.h>
#include <assert.h>
#include <string.h>
#include <stdarg.h>
#include <assert.h>
+#include <stdint.h>
#include <jansson.h>
#include "jansson_private.h"
#include <jansson.h>
#include "jansson_private.h"
@@
-148,7
+149,7
@@
static char stream_get(stream_t *stream, json_error_t *error)
for(i = 1; i < count; i++)
stream->buffer[i] = stream->get(stream->data);
for(i = 1; i < count; i++)
stream->buffer[i] = stream->get(stream->data);
- if(!utf8_check_full(stream->buffer, count))
+ if(!utf8_check_full(stream->buffer, count
, NULL
))
goto out;
stream->stream_pos += count;
goto out;
stream->stream_pos += count;
@@
-221,10
+222,10
@@
static void lex_save_cached(lex_t *lex)
}
/* assumes that str points to 'u' plus at least 4 valid hex digits */
}
/* assumes that str points to 'u' plus at least 4 valid hex digits */
-static int decode_unicode_escape(const char *str)
+static int
32_t
decode_unicode_escape(const char *str)
{
int i;
{
int i;
- int value = 0;
+ int
32_t
value = 0;
assert(str[0] == 'u');
assert(str[0] == 'u');
@@
-325,7
+326,7
@@
static void lex_scan_string(lex_t *lex, json_error_t *error)
if(*p == 'u') {
char buffer[4];
int length;
if(*p == 'u') {
char buffer[4];
int length;
- int value;
+ int
32_t
value;
value = decode_unicode_escape(p);
p += 5;
value = decode_unicode_escape(p);
p += 5;
@@
-333,7
+334,7
@@
static void lex_scan_string(lex_t *lex, json_error_t *error)
if(0xD800 <= value && value <= 0xDBFF) {
/* surrogate pair */
if(*p == '\\' && *(p + 1) == 'u') {
if(0xD800 <= value && value <= 0xDBFF) {
/* surrogate pair */
if(*p == '\\' && *(p + 1) == 'u') {
- int value2 = decode_unicode_escape(++p);
+ int
32_t
value2 = decode_unicode_escape(++p);
p += 5;
if(0xDC00 <= value2 && value2 <= 0xDFFF) {
p += 5;
if(0xDC00 <= value2 && value2 <= 0xDFFF) {
@@
-418,11
+419,15
@@
static int lex_scan_number(lex_t *lex, char c, json_error_t *error)
goto out;
}
}
goto out;
}
}
- else
/* c != '0' */
{
+ else
if(isdigit(c))
{
c = lex_get_save(lex, error);
while(isdigit(c))
c = lex_get_save(lex, error);
}
c = lex_get_save(lex, error);
while(isdigit(c))
c = lex_get_save(lex, error);
}
+ else {
+ lex_unget_unsave(lex, c);
+ goto out;
+ }
if(c != '.' && c != 'E' && c != 'e') {
long value;
if(c != '.' && c != 'E' && c != 'e') {
long value;
@@
-767,7
+772,7
@@
static json_t *parse_value(lex_t *lex, json_error_t *error)
return json;
}
return json;
}
-json_t *parse_json(lex_t *lex, json_error_t *error)
+
static
json_t *parse_json(lex_t *lex, json_error_t *error)
{
error_init(error);
{
error_init(error);
@@
-864,6
+869,8
@@
json_t *json_load_file(const char *path, json_error_t *error)
json_t *result;
FILE *fp;
json_t *result;
FILE *fp;
+ error_init(error);
+
fp = fopen(path, "r");
if(!fp)
{
fp = fopen(path, "r");
if(!fp)
{