summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modules/jack/module-jack-sink.c13
-rw-r--r--src/modules/jack/module-jack-source.c13
2 files changed, 16 insertions, 10 deletions
diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c
index 0b4e7ee4..dfb5be1a 100644
--- a/src/modules/jack/module-jack-sink.c
+++ b/src/modules/jack/module-jack-sink.c
@@ -343,8 +343,9 @@ int pa__init(pa_module*m) {
ports = jack_get_ports(u->client, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsInput);
channels = 0;
- for (p = ports; *p; p++)
- channels++;
+ if (ports)
+ for (p = ports; *p; p++)
+ channels++;
if (!channels)
channels = m->core->default_sample_spec.channels;
@@ -432,7 +433,7 @@ int pa__init(pa_module*m) {
if (do_connect) {
for (i = 0, p = ports; i < ss.channels; i++, p++) {
- if (!*p) {
+ if (!p || !*p) {
pa_log("Not enough physical output ports, leaving unconnected.");
break;
}
@@ -448,7 +449,8 @@ int pa__init(pa_module*m) {
pa_sink_put(u->sink);
- free(ports);
+ if (ports)
+ jack_free(ports);
pa_modargs_free(ma);
return 0;
@@ -457,7 +459,8 @@ fail:
if (ma)
pa_modargs_free(ma);
- free(ports);
+ if (ports)
+ jack_free(ports);
pa__done(m);
diff --git a/src/modules/jack/module-jack-source.c b/src/modules/jack/module-jack-source.c
index 6b128402..8453bd97 100644
--- a/src/modules/jack/module-jack-source.c
+++ b/src/modules/jack/module-jack-source.c
@@ -289,8 +289,9 @@ int pa__init(pa_module*m) {
ports = jack_get_ports(u->client, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsOutput);
channels = 0;
- for (p = ports; *p; p++)
- channels++;
+ if (ports)
+ for (p = ports; *p; p++)
+ channels++;
if (!channels)
channels = m->core->default_sample_spec.channels;
@@ -376,7 +377,7 @@ int pa__init(pa_module*m) {
if (do_connect) {
for (i = 0, p = ports; i < ss.channels; i++, p++) {
- if (!*p) {
+ if (!p || !*p) {
pa_log("Not enough physical output ports, leaving unconnected.");
break;
}
@@ -393,7 +394,8 @@ int pa__init(pa_module*m) {
pa_source_put(u->source);
- free(ports);
+ if (ports)
+ jack_free(ports);
pa_modargs_free(ma);
return 0;
@@ -402,7 +404,8 @@ fail:
if (ma)
pa_modargs_free(ma);
- free(ports);
+ if (ports)
+ jack_free(ports);
pa__done(m);