decoder/DecoderAPI: catch InputStream::Read() exceptions

1bc553ea · Max Kellermann · 687ea536 · 1bc553ea
Commit 1bc553ea authored Sep 16, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

DecoderAPI.cxx src/decoder/DecoderAPI.cxx +4 -1

No files found.
--- a/src/decoder/DecoderAPI.cxx
+++ b/src/decoder/DecoderAPI.cxx
@@ -311,7 +311,7 @@ size_t
 decoder_read(Decoder *decoder,
 	     InputStream &is,
 	     void *buffer, size_t length)
-{
+try {
 	/* XXX don't allow decoder==nullptr */

 	assert(decoder == nullptr ||
@@ -345,6 +345,9 @@ decoder_read(Decoder *decoder,
 		LogError(error);

 	return nbytes;
+} catch (const std::runtime_error &e) {
+	LogError(e);
+	return 0;
 }

 bool