diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-23 12:01:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-23 12:01:03 +0200 |
| commit | 54889c72e3469027a852d9e8ff029d659e612094 (patch) | |
| tree | 19864296a3807db7b0384d8052c4b12775c33ba6 /src/pcm_resample.c | |
| parent | cba126ceb8f1830614a8df04a6b4c1a45f955417 (diff) | |
| download | mpd-54889c72e3469027a852d9e8ff029d659e612094.tar.gz mpd-54889c72e3469027a852d9e8ff029d659e612094.tar.xz mpd-54889c72e3469027a852d9e8ff029d659e612094.zip | |
pcm_convert: use GError for error handling
Don't abort the whole MPD process when the conversion fails. This has
been a denial-of-service attack vector for years.
Diffstat (limited to 'src/pcm_resample.c')
| -rw-r--r-- | src/pcm_resample.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/pcm_resample.c b/src/pcm_resample.c index 1e4a95ceb..f09c65a32 100644 --- a/src/pcm_resample.c +++ b/src/pcm_resample.c @@ -63,14 +63,17 @@ const int16_t * pcm_resample_16(struct pcm_resample_state *state, uint8_t channels, unsigned src_rate, const int16_t *src_buffer, size_t src_size, - unsigned dest_rate, - size_t *dest_size_r) + unsigned dest_rate, size_t *dest_size_r, + GError **error_r) { #ifdef HAVE_LIBSAMPLERATE if (pcm_resample_lsr_enabled()) return pcm_resample_lsr_16(state, channels, src_rate, src_buffer, src_size, - dest_rate, dest_size_r); + dest_rate, dest_size_r, + error_r); +#else + (void)error_r; #endif return pcm_resample_fallback_16(state, channels, @@ -82,14 +85,17 @@ const int32_t * pcm_resample_32(struct pcm_resample_state *state, uint8_t channels, unsigned src_rate, const int32_t *src_buffer, size_t src_size, - unsigned dest_rate, - size_t *dest_size_r) + unsigned dest_rate, size_t *dest_size_r, + GError **error_r) { #ifdef HAVE_LIBSAMPLERATE if (pcm_resample_lsr_enabled()) return pcm_resample_lsr_32(state, channels, src_rate, src_buffer, src_size, - dest_rate, dest_size_r); + dest_rate, dest_size_r, + error_r); +#else + (void)error_r; #endif return pcm_resample_fallback_32(state, channels, |