diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:29:32 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:29:32 +0000 |
commit | b79c6b6bc0546f6e1c3b032f67d244c68ba20808 (patch) | |
tree | 6d26fec76fe6a3d708a7c8025feee23289accc3c /src/pulsecore/sound-file.c | |
parent | b0a20498dbdaf0af981f5351b6295a33a3fa7121 (diff) |
merge r2105 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2159 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/sound-file.c')
-rw-r--r-- | src/pulsecore/sound-file.c | 5 |
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"); |