Merge ~mterry/geonames/+git/double-free:master into geonames:master

Proposed by Michael Terry on 2016-02-25
Status: Rejected
Rejected by: Michael Terry on 2016-02-26
Proposed branch: ~mterry/geonames/+git/double-free:master
Merge into: geonames:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/geonames.c (+1/-1)
Reviewer Review Type Date Requested Status
Geonames developers 2016-02-25 Pending
Review via email: mp+287234@code.launchpad.net

Commit Message

Fix double-free when querying.

Description of the Change

Fix double-free when querying.

To post a comment you must log in.
Michael Terry (mterry) wrote :

Unmerged commits

0b9436a... by Michael Terry on 2016-02-25

Fix double-free

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/geonames.c b/src/geonames.c
2index e7a30ee..9a4ebec 100644
3--- a/src/geonames.c
4+++ b/src/geonames.c
5@@ -94,7 +94,7 @@ geonames_query_cities (const gchar *query,
6 ensure_geonames_data ();
7
8 task = g_task_new (NULL, cancellable, callback, user_data);
9- g_task_set_task_data (task, (gpointer) query, g_free);
10+ g_task_set_task_data (task, (gpointer) g_strdup (query), g_free);
11
12 g_task_run_in_thread (task, task_func);
13 }

Subscribers

People subscribed via source and target branches