From 68faef5b84c06c997e65027656f659e16671ba3a Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 26 Sep 2012 18:21:03 -0700 Subject: [PATCH] Ensure the device's default effect slot is properly aligned --- Alc/ALc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Alc/ALc.c b/Alc/ALc.c index dcbd848f..c1b698cc 100644 --- a/Alc/ALc.c +++ b/Alc/ALc.c @@ -2647,7 +2647,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName) if(deviceName && (!deviceName[0] || strcasecmp(deviceName, alcDefaultName) == 0 || strcasecmp(deviceName, "openal-soft") == 0)) deviceName = NULL; - device = al_calloc(16, sizeof(ALCdevice)+sizeof(ALeffectslot)); + device = al_calloc(16, sizeof(ALCdevice)+15+sizeof(ALeffectslot)); if(!device) { alcSetError(NULL, ALC_OUT_OF_MEMORY); @@ -2833,7 +2833,7 @@ ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *deviceName) if(DefaultEffect.type != AL_EFFECT_NULL) { - device->DefaultSlot = (ALeffectslot*)(device+1); + device->DefaultSlot = (ALeffectslot*)((ALintptrEXT)(device+1)&~15); if(InitEffectSlot(device->DefaultSlot) != AL_NO_ERROR) { device->DefaultSlot = NULL;