From cf139dc012fe592d6e6d6165d536392e02dcb759 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:27:14 +0200 Subject: wavpack: don't use "isp" before initialization The old code called can_seek() with the uninitialized pointer "isp.is". Has this ever worked? Anyway, initialize "isp" first, then call can_seek(&isp). --- src/inputPlugins/wavpack_plugin.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/inputPlugins') diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c index af4a75ebf..e4ac8b1e7 100644 --- a/src/inputPlugins/wavpack_plugin.c +++ b/src/inputPlugins/wavpack_plugin.c @@ -507,15 +507,12 @@ static int wavpack_streamdecode(struct decoder * decoder, InputStream *is) InputStream is_wvc; int open_flags = OPEN_2CH_MAX | OPEN_NORMALIZE /*| OPEN_STREAMING*/; InputStreamPlus isp, isp_wvc; - int canseek; if (wavpack_open_wvc(decoder, &is_wvc)) { initInputStreamPlus(&isp_wvc, decoder, &is_wvc); open_flags |= OPEN_WVC; } - canseek = can_seek(&isp); - initInputStreamPlus(&isp, decoder, is); wpc = WavpackOpenFileInputEx(&mpd_is_reader, &isp, &isp_wvc, error, open_flags, 15); @@ -525,7 +522,7 @@ static int wavpack_streamdecode(struct decoder * decoder, InputStream *is) return -1; } - wavpack_decode(decoder, wpc, canseek, NULL); + wavpack_decode(decoder, wpc, can_seek(&isp), NULL); WavpackCloseFile(wpc); if (open_flags & OPEN_WVC) -- cgit v1.2.3