[pulseaudio-commits] 2 commits - src/modules src/pulsecore

[Arun Raghavan]

 src/modules/module-tunnel.c |    4 ++--
 src/pulsecore/rtpoll.c      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 13664cd977994dc95b0276693b836fcb69e694b5
Author: jungsup lee <jungsup4.lee at samsung.com>
Date:   Wed Jan 6 14:18:50 2016 +0900

    rtpoll: Fix build error when building with DEBUG_TIMING
    
    This typo causes a build error when DEBUG_TIMING is defined.
    Signed-off-by: jungsup lee <jungsup4.lee at samsung.com>

diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
index 13c8677..98cf88f 100644
--- a/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@ -298,7 +298,7 @@ int pa_rtpoll_run(pa_rtpoll *p) {
         p->timestamp = now;
         if (!p->quit && p->timer_enabled)
             pa_log("poll timeout: %d ms ",(int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)));
-        else if (q->quit)
+        else if (p->quit)
             pa_log("poll timeout is ZERO");
         else
             pa_log("poll timeout is FOREVER");

commit 19c71ce85149fa75bc14875d0bb9c9358af57dc7
Author: KimJeongYeon <jeongyeon.kim at samsung.com>
Date:   Wed Jan 6 17:28:11 2016 +0900

    module-tunnel: Fix double free
    
    Local pointer 'dn' freed again when pa_thread_new() failed.
    
    Signed-off-by: KimJeongYeon <jeongyeon.kim at samsung.com>

diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 833423a..53c4402 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -2200,8 +2200,6 @@ int pa__init(pa_module*m) {
     u->mcalign = pa_mcalign_new(pa_frame_size(&u->source->sample_spec));
 #endif
 
-    pa_xfree(dn);
-
     u->time_event = NULL;
 
     u->maxlength = (uint32_t) -1;
@@ -2222,6 +2220,8 @@ int pa__init(pa_module*m) {
     pa_source_put(u->source);
 #endif
 
+    pa_xfree(dn);
+
     if (server)
         pa_xfree(server);