Module: wine
Branch: master
Commit: 182338bab26cdfd904336c0a0508537ad8e62d47
URL:
https://gitlab.winehq.org/wine/wine/-/commit/182338bab26cdfd904336c0a050853…
Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date: Tue Sep 26 08:28:19 2023 +0200
dmusic: Avoid crashing in traces if wave doesn't have a WSMPL.
---
dlls/dmusic/wave.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c
index 08146db0d1c..6637612596a 100644
--- a/dlls/dmusic/wave.c
+++ b/dlls/dmusic/wave.c
@@ -199,14 +199,17 @@ HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry
*parent, IUnk
TRACE(" - wBitsPerSample: %u\n",
This->format->wBitsPerSample);
TRACE(" - cbSize: %u\n", This->format->cbSize);
}
- TRACE(" - sample: {size: %lu, unity_note: %u, fine_tune: %d, attenuation:
%ld, options: %#lx, loops: %lu}\n",
- This->sample->head.cbSize, This->sample->head.usUnityNote,
- This->sample->head.sFineTune,
This->sample->head.lAttenuation,
- This->sample->head.fulOptions,
This->sample->head.cSampleLoops);
- for (i = 0; i < This->sample->head.cSampleLoops; i++)
- TRACE(" - loops[%u]: {size: %lu, type: %lu, start: %lu, length:
%lu}\n", i,
- This->sample->loops[i].cbSize,
This->sample->loops[i].ulType,
- This->sample->loops[i].ulStart,
This->sample->loops[i].ulLength);
+ if (This->sample)
+ {
+ TRACE(" - sample: {size: %lu, unity_note: %u, fine_tune: %d,
attenuation: %ld, options: %#lx, loops: %lu}\n",
+ This->sample->head.cbSize,
This->sample->head.usUnityNote,
+ This->sample->head.sFineTune,
This->sample->head.lAttenuation,
+ This->sample->head.fulOptions,
This->sample->head.cSampleLoops);
+ for (i = 0; i < This->sample->head.cSampleLoops; i++)
+ TRACE(" - loops[%u]: {size: %lu, type: %lu, start: %lu, length:
%lu}\n", i,
+ This->sample->loops[i].cbSize,
This->sample->loops[i].ulType,
+ This->sample->loops[i].ulStart,
This->sample->loops[i].ulLength);
+ }
}
*ret_iface = iface;