aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl/libxl_json.c
diff options
context:
space:
mode:
authorAnthony PERARD <anthony.perard@citrix.com>2011-11-04 12:38:25 +0000
committerAnthony PERARD <anthony.perard@citrix.com>2011-11-04 12:38:25 +0000
commite89264c3df2f6d0203de7480e7fedef3a9e13b57 (patch)
tree882dc178157f35e92b1c1f74730b06cd23d17092 /tools/libxl/libxl_json.c
parentca8450a226a986c24da53edcdfe9410cbe8d9018 (diff)
downloadxen-e89264c3df2f6d0203de7480e7fedef3a9e13b57.tar.gz
xen-e89264c3df2f6d0203de7480e7fedef3a9e13b57.tar.bz2
xen-e89264c3df2f6d0203de7480e7fedef3a9e13b57.zip
libxl: libxl_json: Handle number above LONG_MAX.
The integers are now "long long" in the json_object. If a number (decimal or integer) is too big (or too low), it is stored as it in a string. So for that, we introduce a new type JSON_NUMBER. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/libxl/libxl_json.c')
-rw-r--r--tools/libxl/libxl_json.c74
1 files changed, 53 insertions, 21 deletions
diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index 389b697324..fd5e2aac46 100644
--- a/tools/libxl/libxl_json.c
+++ b/tools/libxl/libxl_json.c
@@ -14,6 +14,7 @@
#include <assert.h>
#include <string.h>
+#include <math.h>
#include <yajl/yajl_parse.h>
#include <yajl/yajl_gen.h>
@@ -44,6 +45,7 @@ struct libxl__yajl_ctx {
# define DEBUG_GEN(ctx, type) yajl_gen_##type(ctx->g)
# define DEBUG_GEN_VALUE(ctx, type, value) yajl_gen_##type(ctx->g, value)
# define DEBUG_GEN_STRING(ctx, str, n) yajl_gen_string(ctx->g, str, n)
+# define DEBUG_GEN_NUMBER(ctx, str, n) yajl_gen_number(ctx->g, str, n)
# define DEBUG_GEN_REPORT(yajl_ctx) \
do { \
const unsigned char *buf = NULL; \
@@ -60,6 +62,7 @@ struct libxl__yajl_ctx {
# define DEBUG_GEN(ctx, type) ((void)0)
# define DEBUG_GEN_VALUE(ctx, type, value) ((void)0)
# define DEBUG_GEN_STRING(ctx, value, lenght) ((void)0)
+# define DEBUG_GEN_NUMBER(ctx, value, lenght) ((void)0)
# define DEBUG_GEN_REPORT(ctx) ((void)0)
#endif
@@ -363,6 +366,7 @@ void libxl__json_object_free(libxl__gc *gc, libxl__json_object *obj)
return;
switch (obj->type) {
case JSON_STRING:
+ case JSON_NUMBER:
free(obj->u.string);
break;
case JSON_MAP: {
@@ -504,36 +508,64 @@ static int json_callback_boolean(void *opaque, int boolean)
return 1;
}
-static int json_callback_integer(void *opaque, long value)
+static bool is_decimal(const char *s, unsigned len)
+{
+ const char *end = s + len;
+ for (; s < end; s++) {
+ if (*s == '.')
+ return true;
+ }
+ return false;
+}
+
+static int json_callback_number(void *opaque, const char *s, unsigned int len)
{
libxl__yajl_ctx *ctx = opaque;
- libxl__json_object *obj;
+ libxl__json_object *obj = NULL;
+ char *t = NULL;
- DEBUG_GEN_VALUE(ctx, integer, value);
+ DEBUG_GEN_NUMBER(ctx, s, len);
- if ((obj = json_object_alloc(ctx->gc, JSON_INTEGER)) == NULL)
- return 0;
- obj->u.i = value;
+ if (is_decimal(s, len)) {
+ double d = strtod(s, NULL);
- if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
- libxl__json_object_free(ctx->gc, obj);
- return 0;
- }
+ if ((d == HUGE_VAL || d == HUGE_VAL) && errno == ERANGE) {
+ goto error;
+ }
- return 1;
-}
+ if ((obj = json_object_alloc(ctx->gc, JSON_DOUBLE)) == NULL)
+ return 0;
+ obj->u.d = d;
+ } else {
+ long long i = strtoll(s, NULL, 10);
-static int json_callback_double(void *opaque, double value)
-{
- libxl__yajl_ctx *ctx = opaque;
- libxl__json_object *obj;
+ if ((i == LLONG_MIN || i == LLONG_MAX) && errno == ERANGE) {
+ goto error;
+ }
- DEBUG_GEN_VALUE(ctx, double, value);
+ if ((obj = json_object_alloc(ctx->gc, JSON_INTEGER)) == NULL)
+ return 0;
+ obj->u.i = i;
+ }
+ goto out;
- if ((obj = json_object_alloc(ctx->gc, JSON_DOUBLE)) == NULL)
+error:
+ /* If the conversion fail, we just store the original string. */
+ if ((obj = json_object_alloc(ctx->gc, JSON_NUMBER)) == NULL)
return 0;
- obj->u.d = value;
+ t = malloc(len + 1);
+ if (t == NULL) {
+ LIBXL__LOG_ERRNO(libxl__gc_owner(ctx->gc), LIBXL__LOG_ERROR,
+ "Failed to allocate");
+ return 0;
+ }
+ strncpy(t, s, len);
+ t[len] = 0;
+
+ obj->u.string = t;
+
+out:
if (json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
libxl__json_object_free(ctx->gc, obj);
return 0;
@@ -706,9 +738,9 @@ static int json_callback_end_array(void *opaque)
static yajl_callbacks callbacks = {
json_callback_null,
json_callback_boolean,
- json_callback_integer,
- json_callback_double,
NULL,
+ NULL,
+ json_callback_number,
json_callback_string,
json_callback_start_map,
json_callback_map_key,