libpurple/protocols/facebook/json.c

changeset 37429
7f8a2f301a82
parent 37363
7201f07fe8f7
child 37430
56c7dbe97266
--- a/libpurple/protocols/facebook/json.c	Mon Dec 21 15:15:47 2015 -0500
+++ b/libpurple/protocols/facebook/json.c	Mon Dec 21 16:31:00 2015 -0500
@@ -258,13 +258,18 @@
 JsonNode *
 fb_json_node_new(const gchar *data, gssize size, GError **error)
 {
+	gchar *slice;
 	JsonNode *root;
 	JsonParser *prsr;
 
+	/* Ensure data is null terminated for json-glib < 1.0.2 */
+	slice = g_strndup(data, size);
+
 	prsr = json_parser_new();
 
-	if (!json_parser_load_from_data(prsr, data, size, error)) {
+	if (!json_parser_load_from_data(prsr, slice, size, error)) {
 		g_object_unref(prsr);
+		g_free(slice);
 		return NULL;
 	}
 
@@ -272,6 +277,7 @@
 	root = json_node_copy(root);
 
 	g_object_unref(prsr);
+	g_free(slice);
 	return root;
 }
 

mercurial