Playing a non-existent CD should fail instead of crash.

d4fb0570 · Ove Kaaven · Alexandre Julliard · ca004e50 · d4fb0570
Commit d4fb0570 authored Jan 03, 1999 by Ove Kaaven Committed by Alexandre Julliard Jan 03, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

mcicda.c multimedia/mcicda.c +6 -0

No files found.
--- a/multimedia/mcicda.c
+++ b/multimedia/mcicda.c
@@ -757,6 +757,12 @@ static DWORD CDAUDIO_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpPa
    } else if (wcda == NULL) {
 	ret = MCIERR_INVALID_DEVICE_ID;
    } else {
+	if (wcda->nTracks == 0) {
+	    if (!CDAUDIO_GetTracksInfo(wcda)) {
+		WARN(cdaudio, "error reading TracksInfo !\n");
+		return MCIERR_DRIVER_INTERNAL;
+	    }
+	}
 	end = wcda->dwTotalLen;
 	wcda->nCurTrack = 1;
    if (dwFlags & MCI_FROM) {