Michael Stefaniuc : dmime: Don't crash when DMSegment loads a MIDI file.
Alexandre Julliard
julliard at winehq.org
Tue Jul 17 15:52:37 CDT 2018
Module: wine
Branch: master
Commit: c8e493cb0c16ef28d9109e3b14f63d9587a8f013
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e493cb0c16ef28d9109e3b14f63d9587a8f013
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Mon Jul 16 23:39:01 2018 +0200
dmime: Don't crash when DMSegment loads a MIDI file.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31829
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dmime/segment.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index dc46069..9a9872b 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -790,10 +790,16 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st
if (!stream)
return E_POINTER;
- if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF)
+ if (stream_get_chunk(stream, &riff) != S_OK ||
+ (riff.id != FOURCC_RIFF && riff.id != mmioFOURCC('M','T','h','d')))
return DMUS_E_UNSUPPORTED_STREAM;
-
stream_reset_chunk_start(stream, &riff);
+
+ if (riff.id == mmioFOURCC('M','T','h','d')) {
+ FIXME("MIDI file loading not supported\n");
+ return S_OK;
+ }
+
hr = IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream,
&This->dmobj.desc);
if (FAILED(hr))
More information about the wine-cvs
mailing list