summaryrefslogtreecommitdiff
path: root/src/modules/module-device-manager.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2013-06-04 20:42:48 +0300
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2013-06-28 09:58:07 +0300
commit67132eea1a987a3cecd6f9edefb5f62df7308c97 (patch)
tree9b94bc791182e6290dbb174274caf62812f2e646 /src/modules/module-device-manager.c
parent491c6a3a0b0ebf66b8f10097ca35ec4e58ab5fa4 (diff)
downloadpulseaudio-67132eea1a987a3cecd6f9edefb5f62df7308c97.tar.gz
device-manager: Add a sanity check for reading entries
There is code elsewhere that assumes that if user_set_description is true, then the description is non-NULL.
Diffstat (limited to 'src/modules/module-device-manager.c')
-rw-r--r--src/modules/module-device-manager.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
index 47c78d41a..8f1d9cd75 100644
--- a/src/modules/module-device-manager.c
+++ b/src/modules/module-device-manager.c
@@ -304,6 +304,11 @@ static struct entry* entry_read(struct userdata *u, const char *name) {
goto fail;
}
+ if (e->user_set_description && !description) {
+ pa_log("Entry has user_set_description set, but the description is NULL.");
+ goto fail;
+ }
+
e->description = pa_xstrdup(description);
e->icon = pa_xstrdup(icon);