[pulseaudio-discuss] [PATCH 6/7] dbusiface-stream: Fix crash when there's no resampling used.

Tanu Kaskinen tanu.kaskinen at digia.com
Fri Mar 4 07:42:12 PST 2011


---
 src/modules/dbus/iface-stream.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/modules/dbus/iface-stream.c b/src/modules/dbus/iface-stream.c
index a9eb373..6b46fa9 100644
--- a/src/modules/dbus/iface-stream.c
+++ b/src/modules/dbus/iface-stream.c
@@ -490,6 +490,9 @@ static void handle_get_resample_method(DBusConnection *conn, DBusMessage *msg, v
     else
         resample_method = pa_resample_method_to_string(s->source_output->actual_resample_method);
 
+    if (!resample_method)
+        resample_method = "";
+
     pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_STRING, &resample_method);
 }
 
@@ -560,6 +563,8 @@ static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdat
         client_path = pa_dbusiface_core_get_client_path(s->core, client);
     for (i = 0; i < channel_map->channels; ++i)
         channels[i] = channel_map->map[i];
+    if (!resample_method)
+        resample_method = "";
 
     pa_assert_se((reply = dbus_message_new_method_return(msg)));
 
-- 
1.7.4.1




More information about the pulseaudio-discuss mailing list