diff options
| -rw-r--r-- | json-glib/json-parser.c | 10 | ||||
| -rw-r--r-- | json-glib/json-parser.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c index 9d40add..4ad9884 100644 --- a/json-glib/json-parser.c +++ b/json-glib/json-parser.c @@ -961,7 +961,7 @@ json_parser_load_from_file (JsonParser *parser, gboolean json_parser_load_from_data (JsonParser *parser, const gchar *data, - gsize length, + gssize length, GError **error) { GScanner *scanner; @@ -972,17 +972,17 @@ json_parser_load_from_data (JsonParser *parser, g_return_val_if_fail (JSON_IS_PARSER (parser), FALSE); g_return_val_if_fail (data != NULL, FALSE); - if (length < 0) - length = strlen (data); - if (parser->priv->root) { json_node_free (parser->priv->root); parser->priv->root = NULL; } + if (length < 0) + length = strlen (data); + scanner = json_scanner_new (parser); - g_scanner_input_text (scanner, data, strlen (data)); + g_scanner_input_text (scanner, data, length); for (i = 0; i < n_symbols; i++) { diff --git a/json-glib/json-parser.h b/json-glib/json-parser.h index c7fd570..efe6d8b 100644 --- a/json-glib/json-parser.h +++ b/json-glib/json-parser.h @@ -138,7 +138,7 @@ gboolean json_parser_load_from_file (JsonParser *parser, GError **error); gboolean json_parser_load_from_data (JsonParser *parser, const gchar *data, - gsize length, + gssize length, GError **error); JsonNode * json_parser_peek_root (JsonParser *parser); |