Commit b571ba27 authored by Romain Bignon's avatar Romain Bignon

fix crash when decoder is NULL

parent de8f2739
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <tremor/ivorbisfile.h> #include <tremor/ivorbisfile.h>
/* Macros to make Tremor's API look like libogg. Tremor always /* Macros to make Tremor's API look like libogg. Tremor always
returns host-byte-order 16-bit signed data, and uses integer returns host-byte-order 16-bit signed data, and uses integer
milliseconds where libogg uses double seconds. milliseconds where libogg uses double seconds.
*/ */
#define ov_read(VF, BUFFER, LENGTH, BIGENDIANP, WORD, SGNED, BITSTREAM) \ #define ov_read(VF, BUFFER, LENGTH, BIGENDIANP, WORD, SGNED, BITSTREAM) \
ov_read(VF, BUFFER, LENGTH, BITSTREAM) ov_read(VF, BUFFER, LENGTH, BITSTREAM)
...@@ -79,7 +79,7 @@ static int ogg_seek_cb(void *data, ogg_int64_t offset, int whence) ...@@ -79,7 +79,7 @@ static int ogg_seek_cb(void *data, ogg_int64_t offset, int whence)
struct vorbis_input_stream *vis = data; struct vorbis_input_stream *vis = data;
return vis->seekable && return vis->seekable &&
decoder_get_command(vis->decoder) != DECODE_COMMAND_STOP && (!vis->decoder || decoder_get_command(vis->decoder) != DECODE_COMMAND_STOP) &&
input_stream_seek(vis->input_stream, offset, whence, NULL) input_stream_seek(vis->input_stream, offset, whence, NULL)
? 0 : -1; ? 0 : -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment