Merge lp:~mterry/geonames/double-free into lp:geonames

[Michael Terry]

Fix double-free when querying.

Fix double-free when querying.

[Allison Lortie (desrt)]

Since we're no longer discarding const, you can also drop the cast.

Looks good, otherwise. Surprised this never caused a problem before.

[lp:~mterry/geonames/double-free]

21. By Michael Terry on 2016-03-01

drop cast

[Michael Terry (mterry)]

Good point, fixed!

I am also surprised this didn't come up before. Even for me, it only introduced oddities in results, not a crash.

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'src/geonames.c'
--- src/geonames.c	2015-10-07 07:44:59 +0000
+++ src/geonames.c	2016-03-01 20:04:04 +0000
@@ -94,7 +94,7 @@
   ensure_geonames_data ();
 
   task = g_task_new (NULL, cancellable, callback, user_data);
-  g_task_set_task_data (task, (gpointer) query, g_free);
+  g_task_set_task_data (task, g_strdup (query), g_free);
 
   g_task_run_in_thread (task, task_func);
 }