jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Drop WPA_TRACE reference before eloop timeout handler call

Browse source 
This avoids bogus error reports for cases where the timeout handler
frees the memory that was pointed to by the eloop timeout context.
This commit is contained in:
Jouni Malinen 2009-12-24 12:41:20 +02:00
parent 1b9eb51bbd
commit 9aca440199
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/utils/eloop.c
View file

@ -336,6 +336,7 @@ int eloop_register_timeout(unsigned int secs, unsigned int usecs,
static void eloop_remove_timeout(struct eloop_timeout *timeout) static void eloop_remove_timeout(struct eloop_timeout *timeout)
{ {
dl_list_del(&timeout->list);
wpa_trace_remove_ref(timeout, eloop, timeout->eloop_data); wpa_trace_remove_ref(timeout, eloop, timeout->eloop_data);
wpa_trace_remove_ref(timeout, user, timeout->user_data); wpa_trace_remove_ref(timeout, user, timeout->user_data);
os_free(timeout); os_free(timeout);
@ -355,7 +356,6 @@ int eloop_cancel_timeout(eloop_timeout_handler handler,
eloop_data == ELOOP_ALL_CTX) && eloop_data == ELOOP_ALL_CTX) &&
(timeout->user_data == user_data || (timeout->user_data == user_data ||
user_data == ELOOP_ALL_CTX)) { user_data == ELOOP_ALL_CTX)) {
dl_list_del(&timeout->list);
eloop_remove_timeout(timeout); eloop_remove_timeout(timeout);
removed++; removed++;
} }
@ -532,10 +532,11 @@ void eloop_run(void)
if (timeout) { if (timeout) {
os_get_time(&now); os_get_time(&now);
if (!os_time_before(&now, &timeout->time)) { if (!os_time_before(&now, &timeout->time)) {
dl_list_del(&timeout->list); void *eloop_data = timeout->eloop_data;
timeout->handler(timeout->eloop_data, void *user_data = timeout->user_data;
timeout->user_data);
eloop_remove_timeout(timeout); eloop_remove_timeout(timeout);
timeout->handler(eloop_data,
user_data);
} }
} }
@ -583,7 +584,6 @@ void eloop_destroy(void)
wpa_trace_dump_funcname("eloop unregistered timeout handler", wpa_trace_dump_funcname("eloop unregistered timeout handler",
timeout->handler); timeout->handler);
wpa_trace_dump("eloop timeout", timeout); wpa_trace_dump("eloop timeout", timeout);
dl_list_del(&timeout->list);
eloop_remove_timeout(timeout); eloop_remove_timeout(timeout);
} }
eloop_sock_table_destroy(&eloop.readers); eloop_sock_table_destroy(&eloop.readers);