Fix possible invalid read while attempting to load module-bluetooth-device.

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index ae54c0a8c468c6abd13e41b20ba0004aeda81579..a83187667447c5da34618c27763efda2fde1c5ab 100755 (executable)
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -73,7 +73,7 @@ load-module module-native-protocol-unix
 #load-module module-rtp-send source=rtp.monitor
 
 ### Enable flat volumes where possible
-load-module module-flat-volumes
+load-module module-flat-volume
 
 ### Automatically restore the volume of streams and devices
 load-module module-device-restore

diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index a33ca6481a4a695c5a9765f9887a16e1f7b46f24..79fb7a8a394e567fda0fec98d657e8027861f562 100644 (file)
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -346,7 +346,7 @@ static void load_module_for_device(struct userdata *u, struct device *d, const c
     pa_m = pa_module_load(u->module->core, "module-bluetooth-device", args);
     pa_xfree(args);
 
-    if (!m) {
+    if (!pa_m) {
         pa_log_debug("Failed to load module for device %s", d->object_path);
         return;
     }