]> code.delx.au - pulseaudio/commitdiff
dbusiface-stream: Fix crash when there's no resampling used.
authorTanu Kaskinen <tanu.kaskinen@digia.com>
Fri, 11 Mar 2011 11:40:20 +0000 (13:40 +0200)
committerTanu Kaskinen <tanu.kaskinen@digia.com>
Fri, 11 Mar 2011 11:40:20 +0000 (13:40 +0200)
src/modules/dbus/iface-stream.c

index a9eb373f2dc7a56cc5acde1eb32caa39cd35c92d..6b46fa914c5fc871f7fd25b40868eb04aa60bf41 100644 (file)
@@ -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)));