mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
Merge branch 'toxav-uaf' of https://github.com/tux3/toxcore
# # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
commit
9b5aa3ff27
|
@ -631,6 +631,7 @@ static void *timer_poll( void *arg )
|
||||||
usleep(handler->resolution);
|
usleep(handler->resolution);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
free(handler);
|
||||||
pthread_exit(NULL);
|
pthread_exit(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -699,8 +700,6 @@ static void timer_terminate_session(TimerHandler *handler)
|
||||||
free(handler->timers);
|
free(handler->timers);
|
||||||
|
|
||||||
pthread_mutex_destroy( &handler->mutex );
|
pthread_mutex_destroy( &handler->mutex );
|
||||||
|
|
||||||
free(handler);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue
Block a user