[geocode-glib/fix-segfault-json-parse] geocode-nominatim: Fix parsing of integer JSON values
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geocode-glib/fix-segfault-json-parse] geocode-nominatim: Fix parsing of integer JSON values
- Date: Mon, 11 Mar 2019 18:58:03 +0000 (UTC)
commit a7b21e6c9feec0e517fae1ebe5806f8a982d3809
Author: Marcus Lundblad <ml update uu se>
Date: Sun Mar 10 22:59:53 2019 +0100
geocode-nominatim: Fix parsing of integer JSON values
It seems Nominatim has changed to (sometimes) use integer
values for certain values (such as osm_id and rank) instead
of strings as it was always before.
Fixes #5
geocode-glib/geocode-nominatim.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/geocode-glib/geocode-nominatim.c b/geocode-glib/geocode-nominatim.c
index c1f6bc7..24aaca0 100644
--- a/geocode-glib/geocode-nominatim.c
+++ b/geocode-glib/geocode-nominatim.c
@@ -1063,21 +1063,24 @@ _geocode_read_nominatim_attributes (JsonReader *reader,
}
for (i = 0; members[i] != NULL; i++) {
- const char *value = NULL;
-
- json_reader_read_member (reader, members[i]);
-
- if (json_reader_is_value (reader)) {
- JsonNode *node = json_reader_get_value (reader);
- if (json_node_get_value_type (node) == G_TYPE_STRING) {
- value = json_node_get_string (node);
- if (value && *value == '\0')
- value = NULL;
- }
- }
-
- if (value != NULL) {
- g_hash_table_insert (ht, g_strdup (members[i]), g_strdup (value));
+ char *value = NULL;
+
+ json_reader_read_member (reader, members[i]);
+
+ if (json_reader_is_value (reader)) {
+ JsonNode *node = json_reader_get_value (reader);
+ if (json_node_get_value_type (node) == G_TYPE_STRING) {
+ value = g_strdup (json_node_get_string (node));
+ if (value && *value == '\0')
+ value = NULL;
+ } else if (json_node_get_value_type (node) == G_TYPE_INT64) {
+ guint64 int_value = json_node_get_int (node);
+ value = g_strdup_printf ("%ld", int_value);
+ }
+ }
+
+ if (value != NULL) {
+ g_hash_table_insert (ht, g_strdup (members[i]), value);
if (i == 0 && is_address) {
if (g_strcmp0 (members[i], "house_number") != 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]