diff options
author | irungentoo_trip <irungentoo@gmail.com> | 2014-10-25 08:55:42 -0700 |
---|---|---|
committer | irungentoo_trip <irungentoo@gmail.com> | 2014-10-25 08:55:42 -0700 |
commit | 9b5aa3ff27531d233bfffdc4aa8c835e2729c15e (patch) | |
tree | 8e7612e7dc0adf27a0e4cf658f8a89ae3ad1d55d /toxav/msi.c | |
parent | b877d1dc1c5f52cc65393c12efa9769094b2cc7f (diff) | |
parent | ea4320733f62c7b3ccc34edde6fc95043bb2d663 (diff) |
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.
Diffstat (limited to 'toxav/msi.c')
-rw-r--r-- | toxav/msi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/toxav/msi.c b/toxav/msi.c index 7f390435..138c8d3f 100644 --- a/toxav/msi.c +++ b/toxav/msi.c | |||
@@ -631,6 +631,7 @@ static void *timer_poll( void *arg ) | |||
631 | usleep(handler->resolution); | 631 | usleep(handler->resolution); |
632 | } | 632 | } |
633 | 633 | ||
634 | free(handler); | ||
634 | pthread_exit(NULL); | 635 | pthread_exit(NULL); |
635 | } | 636 | } |
636 | 637 | ||
@@ -699,8 +700,6 @@ static void timer_terminate_session(TimerHandler *handler) | |||
699 | free(handler->timers); | 700 | free(handler->timers); |
700 | 701 | ||
701 | pthread_mutex_destroy( &handler->mutex ); | 702 | pthread_mutex_destroy( &handler->mutex ); |
702 | |||
703 | free(handler); | ||
704 | } | 703 | } |
705 | 704 | ||
706 | /** | 705 | /** |