From 4b6ab291a787ff597c938842b569a35434ab11d8 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 16 May 2006 23:47:38 +0000
Subject: * modify pa_channel_map_init_auto() to take an extra argument
 specifying the standard to use (ALSA, AIFF, ...) * add some more validity
 checks to
 pa_source_new(),pa_sink_new(),pa_sink_input_new(),pa_source_output_new()

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@888 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/polypcore/source.c | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

(limited to 'src/polypcore/source.c')

diff --git a/src/polypcore/source.c b/src/polypcore/source.c
index 3a78825b..fca281a7 100644
--- a/src/polypcore/source.c
+++ b/src/polypcore/source.c
@@ -34,26 +34,43 @@
 #include <polypcore/core-subscribe.h>
 #include <polypcore/log.h>
 #include <polypcore/sample-util.h>
+#include <polypcore/utf8.h>
 
 #include "source.h"
 
+#define CHECK_VALIDITY_RETURN_NULL(condition) \
+do {\
+if (!(condition)) \
+    return NULL; \
+} while (0)
+
 pa_source* pa_source_new(
-    pa_core *core,
-    const char *driver,
-    const char *name,
-    int fail,
-    const pa_sample_spec *spec,
-    const pa_channel_map *map) {
+        pa_core *core,
+        const char *driver,
+        const char *name,
+        int fail,
+        const pa_sample_spec *spec,
+        const pa_channel_map *map) {
     
     pa_source *s;
     char st[256];
     int r;
+    pa_channel_map tmap;
     
     assert(core);
     assert(name);
-    assert(*name);
     assert(spec);
 
+    CHECK_VALIDITY_RETURN_NULL(pa_sample_spec_valid(spec));
+
+    if (!map)
+        map = pa_channel_map_init_auto(&tmap, spec->channels, PA_CHANNEL_MAP_DEFAULT);
+
+    CHECK_VALIDITY_RETURN_NULL(map && pa_channel_map_valid(map));
+    CHECK_VALIDITY_RETURN_NULL(map->channels == spec->channels);
+    CHECK_VALIDITY_RETURN_NULL(!driver || pa_utf8_valid(driver));
+    CHECK_VALIDITY_RETURN_NULL(pa_utf8_valid(name) && *name);
+
     s = pa_xnew(pa_source, 1);
 
     if (!(name = pa_namereg_register(core, name, PA_NAMEREG_SOURCE, s, fail))) {
@@ -70,10 +87,7 @@ pa_source* pa_source_new(
     s->owner = NULL;
     
     s->sample_spec = *spec;
-    if (map)
-        s->channel_map = *map;
-    else
-        pa_channel_map_init_auto(&s->channel_map, spec->channels);
+    s->channel_map = *map;
 
     s->outputs = pa_idxset_new(NULL, NULL);
     s->monitor_of = NULL;
-- 
cgit