From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Date: Thu, 11 Oct 2012 10:45:41 +0000 (+0300)
Subject: gresolv: Remove lookup from correct queue
X-Git-Tag: 1.9~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9f0fc7962603344d071f5f34caf9e4efb8707940;p=platform%2Fupstream%2Fconnman.git

gresolv: Remove lookup from correct queue

The lookup must be removed from lookup queue and not from query
queue when cancelling the lookup. Otherwise it is possible that
we might access an already removed lookup that is still found in
lookup queue.

Fixes BMC#25728
---

diff --git a/gweb/gresolv.c b/gweb/gresolv.c
index 79abc9b7..77c1afb8 100644
--- a/gweb/gresolv.c
+++ b/gweb/gresolv.c
@@ -1043,8 +1043,8 @@ gboolean g_resolv_cancel_lookup(GResolv *resolv, guint id)
 	if (list == NULL)
 		return FALSE;
 
+	g_queue_remove(resolv->lookup_queue, list->data);
 	destroy_lookup(list->data);
-	g_queue_remove(resolv->query_queue, list->data);
 
 	return TRUE;
 }