/*
- * Copyright (c) 2009-201
1 Petri Lehtinen <petri@digip.org>
- * Copyright (c) 2011 Graeme Smecher <graeme.smecher@mail.mcgill.ca>
+ * Copyright (c) 2009-201
2 Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2011-2012 Graeme Smecher <graeme.smecher@mail.mcgill.ca>
*
* Jansson is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
*/
+#include <string.h>
#include <jansson.h>
#include "jansson_private.h"
+#include "utf.h"
typedef struct {
+ const char *start;
const char *fmt;
char token;
json_error_t *error;
#define type_name(x) type_names[json_typeof(x)]
+static const char *unpack_value_starters = "{[siIbfFOon";
+
+
+static void scanner_init(scanner_t *s, json_error_t *error,
+ size_t flags, const char *fmt)
+{
+ s->error = error;
+ s->flags = flags;
+ s->fmt = s->start = fmt;
+ s->line = 1;
+ s->column = 0;
+}
+
static void next_token(scanner_t *s)
{
const char *t = s->fmt;
s->fmt = t;
}
-static void set_error(scanner_t *s, const char *fmt, ...)
+static void set_error(scanner_t *s, const char *source, const char *fmt, ...)
{
va_list ap;
+ size_t pos;
va_start(ap, fmt);
- jsonp_error_vset(s->error, s->line, s->column, fmt, ap);
+
+ pos = (size_t)(s->fmt - s->start);
+ jsonp_error_vset(s->error, s->line, s->column, pos, fmt, ap);
+
+ jsonp_error_set_source(s->error, source);
+
va_end(ap);
}
json_t *value;
if(!s->token) {
- set_error(s, "Unexpected end of format string");
+ set_error(s, "<format>", "Unexpected end of format string");
goto error;
}
if(s->token != 's') {
- set_error(s, "Expected format 's', got '%c'\n", *s->fmt);
+ set_error(s, "<format>", "Expected format 's', got '%c'", s->token);
goto error;
}
key = va_arg(*ap, const char *);
if(!key) {
- set_error(s, "NULL object key");
+ set_error(s, "<args>", "NULL object key");
+ goto error;
+ }
+
+ if(!utf8_check_string(key, -1)) {
+ set_error(s, "<args>", "Invalid UTF-8 in object key");
goto error;
}
if(!value)
goto error;
- if(json_object_set_new(object, key, value)) {
- set_error(s, "Unable to add key \"%s\"", key);
+ if(json_object_set_new_nocheck(object, key, value)) {
+ set_error(s, "<internal>", "Unable to add key \"%s\"", key);
goto error;
}
json_t *value;
if(!s->token) {
- set_error(s, "Unexpected end of format string");
+ set_error(s, "<format>", "Unexpected end of format string");
goto error;
}
goto error;
if(json_array_append_new(array, value)) {
- set_error(s, "Unable to append to array");
+ set_error(s, "<internal>", "Unable to append to array");
goto error;
}
{
const char *str = va_arg(*ap, const char *);
if(!str) {
- set_error(s, "NULL string");
+ set_error(s, "<args>", "NULL string argument");
return NULL;
}
- return json_string(str);
+ if(!utf8_check_string(str, -1)) {
+ set_error(s, "<args>", "Invalid UTF-8 string");
+ return NULL;
+ }
+ return json_string_nocheck(str);
}
case 'n': /* null */
return va_arg(*ap, json_t *);
default:
- set_error(s, "Unrecognized format character '%c'", s->token);
+ set_error(s, "<format>", "Unexpected format character '%c'",
+ s->token);
return NULL;
}
}
*/
hashtable_t key_set;
- if(hashtable_init(&key_set, jsonp_hash_key, jsonp_key_equal, NULL, NULL)) {
- set_error(s, "Out of memory");
+ if(hashtable_init(&key_set)) {
+ set_error(s, "<internal>", "Out of memory");
return -1;
}
- if(!json_is_object(root)) {
- set_error(s, "Expected object, got %s", type_name(root));
+ if(root && !json_is_object(root)) {
+ set_error(s, "<validation>", "Expected object, got %s",
+ type_name(root));
goto out;
}
next_token(s);
while(s->token != '}') {
const char *key;
json_t *value;
+ int opt = 0;
if(strict != 0) {
- set_error(s, "Expected '}' after '%c', got '%c'",
+ set_error(s, "<format>", "Expected '}' after '%c', got '%c'",
(strict == 1 ? '!' : '*'), s->token);
goto out;
}
if(!s->token) {
- set_error(s, "Unexpected end of format string");
+ set_error(s, "<format>", "Unexpected end of format string");
goto out;
}
}
if(s->token != 's') {
- set_error(s, "Expected format 's', got '%c'\n", *s->fmt);
+ set_error(s, "<format>", "Expected format 's', got '%c'", s->token);
goto out;
}
key = va_arg(*ap, const char *);
if(!key) {
- set_error(s, "NULL object key");
+ set_error(s, "<args>", "NULL object key");
goto out;
}
next_token(s);
- value = json_object_get(root, key);
+ if(s->token == '?') {
+ opt = 1;
+ next_token(s);
+ }
+
+ if(!root) {
+ /* skipping */
+ value = NULL;
+ }
+ else {
+ value = json_object_get(root, key);
+ if(!value && !opt) {
+ set_error(s, "<validation>", "Object item not found: %s", key);
+ goto out;
+ }
+ }
+
if(unpack(s, value, ap))
goto out;
- hashtable_set(&key_set, (void *)key, NULL);
+ hashtable_set(&key_set, key, 0, json_null());
next_token(s);
}
if(strict == 0 && (s->flags & JSON_STRICT))
strict = 1;
- if(strict == 1 && key_set.size != json_object_size(root)) {
+ if(root && strict == 1 && key_set.size != json_object_size(root)) {
long diff = (long)json_object_size(root) - (long)key_set.size;
- set_error(s, "%li object items left unpacked", diff);
+ set_error(s, "<validation>", "%li object item(s) left unpacked", diff);
goto out;
}
size_t i = 0;
int strict = 0;
- if(!json_is_array(root)) {
- set_error(s, "Expected array, got %s", type_name(root));
+ if(root && !json_is_array(root)) {
+ set_error(s, "<validation>", "Expected array, got %s", type_name(root));
return -1;
}
next_token(s);
json_t *value;
if(strict != 0) {
- set_error(s, "Expected ']' after '%c', got '%c'",
+ set_error(s, "<format>", "Expected ']' after '%c', got '%c'",
(strict == 1 ? '!' : '*'),
s->token);
return -1;
}
if(!s->token) {
- set_error(s, "Unexpected end of format string");
+ set_error(s, "<format>", "Unexpected end of format string");
return -1;
}
continue;
}
- value = json_array_get(root, i);
- if(!value) {
- set_error(s, "Array index %lu out of range", (unsigned long)i);
+ if(!strchr(unpack_value_starters, s->token)) {
+ set_error(s, "<format>", "Unexpected format character '%c'",
+ s->token);
return -1;
}
+ if(!root) {
+ /* skipping */
+ value = NULL;
+ }
+ else {
+ value = json_array_get(root, i);
+ if(!value) {
+ set_error(s, "<validation>", "Array index %lu out of range",
+ (unsigned long)i);
+ return -1;
+ }
+ }
+
if(unpack(s, value, ap))
return -1;
if(strict == 0 && (s->flags & JSON_STRICT))
strict = 1;
- if(strict == 1 && i != json_array_size(root)) {
+ if(root && strict == 1 && i != json_array_size(root)) {
long diff = (long)json_array_size(root) - (long)i;
- set_error(s, "%li array items left upacked", diff);
+ set_error(s, "<validation>", "%li array item(s) left unpacked", diff);
return -1;
}
return unpack_array(s, root, ap);
case 's':
- if(!json_is_string(root)) {
- set_error(s, "Expected string, got %s", type_name(root));
+ if(root && !json_is_string(root)) {
+ set_error(s, "<validation>", "Expected string, got %s",
+ type_name(root));
return -1;
}
if(!(s->flags & JSON_VALIDATE_ONLY)) {
- const char **str;
+ const char **target;
- str = va_arg(*ap, const char **);
- if(!str) {
- set_error(s, "NULL string");
+ target = va_arg(*ap, const char **);
+ if(!target) {
+ set_error(s, "<args>", "NULL string argument");
return -1;
}
- *str = json_string_value(root);
+ if(root)
+ *target = json_string_value(root);
}
return 0;
case 'i':
- if(!json_is_integer(root)) {
- set_error(s, "Expected integer, got %s", type_name(root));
+ if(root && !json_is_integer(root)) {
+ set_error(s, "<validation>", "Expected integer, got %s",
+ type_name(root));
return -1;
}
- if(!(s->flags & JSON_VALIDATE_ONLY))
- *va_arg(*ap, int*) = json_integer_value(root);
+ if(!(s->flags & JSON_VALIDATE_ONLY)) {
+ int *target = va_arg(*ap, int*);
+ if(root)
+ *target = json_integer_value(root);
+ }
return 0;
case 'I':
- if(!json_is_integer(root)) {
- set_error(s, "Expected integer, got %s", type_name(root));
+ if(root && !json_is_integer(root)) {
+ set_error(s, "<validation>", "Expected integer, got %s",
+ type_name(root));
return -1;
}
- if(!(s->flags & JSON_VALIDATE_ONLY))
- *va_arg(*ap, json_int_t*) = json_integer_value(root);
+ if(!(s->flags & JSON_VALIDATE_ONLY)) {
+ json_int_t *target = va_arg(*ap, json_int_t*);
+ if(root)
+ *target = json_integer_value(root);
+ }
return 0;
case 'b':
- if(!json_is_boolean(root)) {
- set_error(s, "Expected true or false, got %s", type_name(root));
+ if(root && !json_is_boolean(root)) {
+ set_error(s, "<validation>", "Expected true or false, got %s",
+ type_name(root));
return -1;
}
- if(!(s->flags & JSON_VALIDATE_ONLY))
- *va_arg(*ap, int*) = json_is_true(root);
+ if(!(s->flags & JSON_VALIDATE_ONLY)) {
+ int *target = va_arg(*ap, int*);
+ if(root)
+ *target = json_is_true(root);
+ }
return 0;
case 'f':
- if(!json_is_real(root)) {
- set_error(s, "Expected real, got %s", type_name(root));
+ if(root && !json_is_real(root)) {
+ set_error(s, "<validation>", "Expected real, got %s",
+ type_name(root));
return -1;
}
- if(!(s->flags & JSON_VALIDATE_ONLY))
- *va_arg(*ap, double*) = json_real_value(root);
+ if(!(s->flags & JSON_VALIDATE_ONLY)) {
+ double *target = va_arg(*ap, double*);
+ if(root)
+ *target = json_real_value(root);
+ }
return 0;
case 'F':
- if(!json_is_number(root)) {
- set_error(s, "Expected real or integer, got %s",
+ if(root && !json_is_number(root)) {
+ set_error(s, "<validation>", "Expected real or integer, got %s",
type_name(root));
return -1;
}
- if(!(s->flags & JSON_VALIDATE_ONLY))
- *va_arg(*ap, double*) = json_number_value(root);
+ if(!(s->flags & JSON_VALIDATE_ONLY)) {
+ double *target = va_arg(*ap, double*);
+ if(root)
+ *target = json_number_value(root);
+ }
return 0;
case 'O':
- if(!(s->flags & JSON_VALIDATE_ONLY))
+ if(root && !(s->flags & JSON_VALIDATE_ONLY))
json_incref(root);
/* Fall through */
case 'o':
- if(!(s->flags & JSON_VALIDATE_ONLY))
- *va_arg(*ap, json_t**) = root;
+ if(!(s->flags & JSON_VALIDATE_ONLY)) {
+ json_t **target = va_arg(*ap, json_t**);
+ if(root)
+ *target = root;
+ }
return 0;
case 'n':
/* Never assign, just validate */
- if(!json_is_null(root)) {
- set_error(s, "Expected null, got %s", type_name(root));
+ if(root && !json_is_null(root)) {
+ set_error(s, "<validation>", "Expected null, got %s",
+ type_name(root));
return -1;
}
return 0;
default:
- set_error(s, "Unknown format character '%c'", s->token);
+ set_error(s, "<format>", "Unexpected format character '%c'",
+ s->token);
return -1;
}
}
const char *fmt, va_list ap)
{
scanner_t s;
+ va_list ap_copy;
json_t *value;
- jsonp_error_init(error, "");
-
if(!fmt || !*fmt) {
- jsonp_error_set(error, 1, 1, "Null or empty format string");
+ jsonp_error_init(error, "<format>");
+ jsonp_error_set(error, -1, -1, 0, "NULL or empty format string");
return NULL;
}
+ jsonp_error_init(error, NULL);
- s.error = error;
- s.flags = flags;
- s.fmt = fmt;
- s.line = 1;
- s.column = 0;
-
+ scanner_init(&s, error, flags, fmt);
next_token(&s);
- value = pack(&s, &ap);
+
+ va_copy(ap_copy, ap);
+ value = pack(&s, &ap_copy);
+ va_end(ap_copy);
+
+ if(!value)
+ return NULL;
next_token(&s);
if(s.token) {
json_decref(value);
- set_error(&s, "Garbage after format string");
+ set_error(&s, "<format>", "Garbage after format string");
return NULL;
}
const char *fmt, va_list ap)
{
scanner_t s;
+ va_list ap_copy;
- jsonp_error_init(error, "");
+ if(!root) {
+ jsonp_error_init(error, "<root>");
+ jsonp_error_set(error, -1, -1, 0, "NULL root value");
+ return -1;
+ }
if(!fmt || !*fmt) {
- jsonp_error_set(error, 1, 1, "Null or empty format string");
+ jsonp_error_init(error, "<format>");
+ jsonp_error_set(error, -1, -1, 0, "NULL or empty format string");
return -1;
}
+ jsonp_error_init(error, NULL);
- s.error = error;
- s.flags = flags;
- s.fmt = fmt;
- s.line = 1;
- s.column = 0;
-
+ scanner_init(&s, error, flags, fmt);
next_token(&s);
- if(unpack(&s, root, &ap))
+ va_copy(ap_copy, ap);
+ if(unpack(&s, root, &ap_copy)) {
+ va_end(ap_copy);
return -1;
+ }
+ va_end(ap_copy);
next_token(&s);
if(s.token) {
- set_error(&s, "Garbage after format string");
+ set_error(&s, "<format>", "Garbage after format string");
return -1;
}
projects / profile / ivi / jansson.git / blobdiff