[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-99-g7c5a959

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  c4dff4d416a8900f10c5fd73601da08fbfd73e88 (commit)

- Log -----------------------------------------------------------------
7c5a959... initialize IP ACLs properly
8ca254c... fix two uninitialized memory accesses
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-alsa-sink.c   |    6 +++---
 src/modules/module-alsa-source.c |    6 +++---
 src/pulsecore/protocol-esound.c  |    2 +-
 src/pulsecore/protocol-native.c  |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------

commit 8ca254c49065cb49fcc6225f1270752f61ba8b17
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 11 19:46:11 2008 +0200

    fix two uninitialized memory accesses

diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index aad6801..cba959f 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -239,7 +239,7 @@ static size_t check_left_to_play(struct userdata *u, snd_pcm_sframes_t n) {
 
 static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec) {
     int work_done = 0;
-    pa_usec_t max_sleep_usec, process_usec;
+    pa_usec_t max_sleep_usec = 0, process_usec = 0;
     size_t left_to_play;
 
     pa_assert(u);
@@ -354,7 +354,7 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec) {
 
 static int unix_write(struct userdata *u, pa_usec_t *sleep_usec) {
     int work_done = 0;
-    pa_usec_t max_sleep_usec, process_usec;
+    pa_usec_t max_sleep_usec = 0, process_usec = 0;
     size_t left_to_play;
 
     pa_assert(u);
@@ -974,7 +974,7 @@ static void thread_func(void *userdata) {
         /* Render some data and write it to the dsp */
         if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) {
             int work_done;
-            pa_usec_t sleep_usec;
+            pa_usec_t sleep_usec = 0;
 
             if (u->sink->thread_info.rewind_requested)
                 if (process_rewind(u) < 0)
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 1cc467d..f1b6622 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -234,7 +234,7 @@ static size_t check_left_to_record(struct userdata *u, snd_pcm_sframes_t n) {
 
 static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec) {
     int work_done = 0;
-    pa_usec_t max_sleep_usec, process_usec;
+    pa_usec_t max_sleep_usec = 0, process_usec = 0;
     size_t left_to_record;
 
     pa_assert(u);
@@ -331,7 +331,7 @@ static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec) {
 
 static int unix_read(struct userdata *u, pa_usec_t *sleep_usec) {
     int work_done = 0;
-    pa_usec_t max_sleep_usec, process_usec;
+    pa_usec_t max_sleep_usec = 0, process_usec = 0;
     size_t left_to_record;
 
     pa_assert(u);
@@ -837,7 +837,7 @@ static void thread_func(void *userdata) {
         /* Read some data and pass it to the sources */
         if (PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
             int work_done = 0;
-            pa_usec_t sleep_usec;
+            pa_usec_t sleep_usec = 0;
 
             if (u->use_mmap)
                 work_done = mmap_read(u, &sleep_usec);

commit 7c5a95950e05fd8889c162b9e55d07d07958fd77
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Aug 11 19:46:28 2008 +0200

    initialize IP ACLs properly

diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c
index f190d96..36d1b45 100644
--- a/src/pulsecore/protocol-esound.c
+++ b/src/pulsecore/protocol-esound.c
@@ -1574,7 +1574,7 @@ int pa_esound_options_parse(pa_esound_options *o, pa_core *c, pa_modargs *ma) {
     if ((acl = pa_modargs_get_value(ma, "auth-ip-acl", NULL))) {
         pa_ip_acl *ipa;
 
-        if (!(o->auth_ip_acl = pa_ip_acl_new(acl))) {
+        if (!(ipa = pa_ip_acl_new(acl))) {
             pa_log("Failed to parse IP ACL '%s'", acl);
             return -1;
         }
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 9bf1059..0e07276 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -4299,7 +4299,7 @@ int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) {
     if ((acl = pa_modargs_get_value(ma, "auth-ip-acl", NULL))) {
         pa_ip_acl *ipa;
 
-        if (!(o->auth_ip_acl = pa_ip_acl_new(acl))) {
+        if (!(ipa = pa_ip_acl_new(acl))) {
             pa_log("Failed to parse IP ACL '%s'", acl);
             return -1;
         }

-- 
hooks/post-receive
PulseAudio Sound Server