mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
Anthony PERARD
544c15c827
This allows to parse a string that is not NUL-terminated. With that option disabled, YAJL v2 would look ahead on completion to find out if there is more to parse. YAJL v1 doesn't have this behavior. Any function that allocates a yajl_handle via this function either parse a NUL-terminated string, or do provide proper length. So change the default and allow garbage (like a different JSON document) after the end of the data to parse. This is important for the QMP client, as there could be more than one message to parse, and YAJL would consider the next message to be garbage and throw an error. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com>
97 lines
3.1 KiB
C
97 lines
3.1 KiB
C
/*
|
|
* Copyright (C) 2011 Citrix Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published
|
|
* by the Free Software Foundation; version 2.1 only. with the special
|
|
* exception on linking described in file LICENSE.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*/
|
|
|
|
#ifndef LIBXL_JSON_H
|
|
#define LIBXL_JSON_H
|
|
|
|
#include <yajl/yajl_gen.h>
|
|
#include <yajl/yajl_parse.h>
|
|
|
|
#ifdef HAVE_YAJL_YAJL_VERSION_H
|
|
# include <yajl/yajl_version.h>
|
|
#endif
|
|
|
|
yajl_gen_status libxl__uint64_gen_json(yajl_gen hand, uint64_t val);
|
|
yajl_gen_status libxl_defbool_gen_json(yajl_gen hand, libxl_defbool *p);
|
|
yajl_gen_status libxl_uuid_gen_json(yajl_gen hand, libxl_uuid *p);
|
|
yajl_gen_status libxl_mac_gen_json(yajl_gen hand, libxl_mac *p);
|
|
yajl_gen_status libxl_bitmap_gen_json(yajl_gen hand, libxl_bitmap *p);
|
|
yajl_gen_status libxl_cpuid_policy_list_gen_json(yajl_gen hand,
|
|
libxl_cpuid_policy_list *p);
|
|
yajl_gen_status libxl_string_list_gen_json(yajl_gen hand, libxl_string_list *p);
|
|
yajl_gen_status libxl_key_value_list_gen_json(yajl_gen hand,
|
|
libxl_key_value_list *p);
|
|
yajl_gen_status libxl_hwcap_gen_json(yajl_gen hand, libxl_hwcap *p);
|
|
yajl_gen_status libxl_ms_vm_genid_gen_json(yajl_gen hand, libxl_ms_vm_genid *p);
|
|
|
|
#include <_libxl_types_json.h>
|
|
|
|
/* YAJL version check */
|
|
#if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1)
|
|
# define HAVE_YAJL_V2 1
|
|
#endif
|
|
|
|
#ifdef HAVE_YAJL_V2
|
|
|
|
typedef size_t libxl_yajl_length;
|
|
|
|
static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks,
|
|
yajl_alloc_funcs *allocFuncs,
|
|
void *ctx)
|
|
{
|
|
yajl_handle hand = yajl_alloc(callbacks, allocFuncs, ctx);
|
|
if (hand)
|
|
yajl_config(hand, yajl_allow_trailing_garbage, 1);
|
|
return hand;
|
|
}
|
|
|
|
static inline yajl_gen libxl_yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
|
|
{
|
|
yajl_gen g;
|
|
g = yajl_gen_alloc(allocFuncs);
|
|
if (g)
|
|
yajl_gen_config(g, yajl_gen_beautify, 1);
|
|
return g;
|
|
}
|
|
|
|
#else /* !HAVE_YAJL_V2 */
|
|
|
|
#define yajl_complete_parse yajl_parse_complete
|
|
|
|
typedef unsigned int libxl_yajl_length;
|
|
|
|
static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks,
|
|
const yajl_alloc_funcs *allocFuncs,
|
|
void *ctx)
|
|
{
|
|
yajl_parser_config cfg = {
|
|
.allowComments = 1,
|
|
.checkUTF8 = 1,
|
|
};
|
|
return yajl_alloc(callbacks, &cfg, allocFuncs, ctx);
|
|
}
|
|
|
|
static inline yajl_gen libxl_yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
|
|
{
|
|
yajl_gen_config conf = { 1, " " };
|
|
return yajl_gen_alloc(&conf, allocFuncs);
|
|
}
|
|
|
|
#endif /* !HAVE_YAJL_V2 */
|
|
|
|
yajl_gen_status libxl_domain_config_gen_json(yajl_gen hand,
|
|
libxl_domain_config *p);
|
|
|
|
#endif /* LIBXL_JSON_H */
|