summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-05-01 04:11:30 +0200
committerColin Guthrie <cguthrie@mandriva.org>2009-06-08 22:31:50 +0100
commita5fad31238a9379a589c7a5c629352a8c914f709 (patch)
tree864b24259608b84c546b47f88380dcf61a1bb0e0
parentc7ec01326190a0bcdcca77307728a7dabb9fb1d2 (diff)
alsa: don't hit an assert when invalid module arguments are passed
-rw-r--r--src/modules/alsa/alsa-sink.c3
-rw-r--r--src/modules/alsa/alsa-source.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 2fbcd7be..360cb4d5 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1770,7 +1770,8 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
fail:
- userdata_free(u);
+ if (u)
+ userdata_free(u);
return NULL;
}
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index c59fc75f..19c6cfcd 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1621,7 +1621,8 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
fail:
- userdata_free(u);
+ if (u)
+ userdata_free(u);
return NULL;
}