]> xenbits.xensource.com Git - people/gdunlap/xen.git/commitdiff
libxl: fix off-by-one error in JSON parser
authorWei Liu <wei.liu2@citrix.com>
Wed, 25 Feb 2015 14:56:00 +0000 (14:56 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Mon, 2 Mar 2015 17:05:02 +0000 (17:05 +0000)
We need a sentinel slot in the generated libxl_key_value_list.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
tools/libxl/libxl_json.c

index ceb014a32392f83a6f4f143999469a0e1b609468..98335b05b246ec3287f79d748bd87d9b16abf966 100644 (file)
@@ -247,7 +247,7 @@ int libxl__key_value_list_parse_json(libxl__gc *gc, const libxl__json_object *o,
 
     maps = libxl__json_object_get_map(o);
     size = maps->count * 2;
-    kvl = *p = libxl__calloc(NOGC, size, sizeof(char *));
+    kvl = *p = libxl__calloc(NOGC, size+1, sizeof(char *));
 
     for (i = 0; i < maps->count; i++) {
         int idx = i * 2;