sndio: Fix segmentation fault when audio card is removed

This can happen if you remove an external audio card or if you stop sndiod(8) while playing a song. sio_write() will retry internally if it fails with errno == EINTR so no need to handle that.

sndio: Fix segmentation fault when audio card is removed
d4f801a8 · Dimitris Papastamos · Max Kellermann · cb1082c5 · d4f801a8
Commit d4f801a8 authored Jun 22, 2016 by Dimitris Papastamos Committed by Max Kellermann Jun 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

SndioOutputPlugin.cxx src/output/plugins/SndioOutputPlugin.cxx +5 -6

No files found.
--- a/src/output/plugins/SndioOutputPlugin.cxx
+++ b/src/output/plugins/SndioOutputPlugin.cxx
@@ -17,7 +17,6 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include <errno.h>
 #include <sndio.h>
 #include <string.h>
 #include <unistd.h>
@@ -183,11 +182,11 @@ SndioOutput::Play(const void *chunk, size_t size, Error &error)

 	while (1) {
 		n = sio_write(sio_hdl, chunk, size);
-		if (n < 0) {
-			if (errno == EINTR)
-				continue;
-			error.FormatErrno("Failed to write %zu bytes to sndio output", size);
-			return 0;
+		if (n == 0) {
+			if (sio_eof(sio_hdl)) {
+				error.Set(sndio_output_domain, -1, "sndio write failed");
+				return 0;
+			}
 		}
 		return n;
 	}