summaryrefslogtreecommitdiffstats
path: root/src/pulsecore/sound-file.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-02-13 22:13:44 +0000
committerLennart Poettering <lennart@poettering.net>2008-02-13 22:13:44 +0000
commit86b9ef8c961bed9d3a65f044741bb423c26d8005 (patch)
tree4f588c2d88c235374ba5e3766f7e3350394f2acd /src/pulsecore/sound-file.c
parenta3e820fca7e264037adf525a8af8894190f25ec7 (diff)
deal with a possibly failing pa_channel_map_init_auto() correctly
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2105 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/sound-file.c')
-rw-r--r--src/pulsecore/sound-file.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pulsecore/sound-file.c b/src/pulsecore/sound-file.c
index 7e88734c..3e6f683d 100644
--- a/src/pulsecore/sound-file.c
+++ b/src/pulsecore/sound-file.c
@@ -119,7 +119,10 @@ int pa_sound_file_load(
}
if (map)
- pa_channel_map_init_auto(map, ss->channels, PA_CHANNEL_MAP_DEFAULT);
+ if (!pa_channel_map_init_auto(map, ss->channels, PA_CHANNEL_MAP_DEFAULT)) {
+ pa_log("Unsupported channel map in file %s", fname);
+ goto finish;
+ }
if ((l = pa_frame_size(ss) * sfinfo.frames) > PA_SCACHE_ENTRY_SIZE_MAX) {
pa_log("File too large");