commit d970c097f4bec68419deef6e7c5f47c734570ebc
author Carlos Lozano <clozano@andago.com> Tue Nov 04 04:17:28 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Nov 04 04:17:28 2003 +0000
tree 2003b4f83bda2bd6a664643c054503c7a777b08a
parent a062677a95d3d3a8a8d7e47064d716cf07471720

Check that we don't write out of the defined range of palettes.

dlls/d3d8/device.c

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 8348fdd..2dd7be5 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -3585,11 +3585,17 @@
     ICOM_THIS(IDirect3DDevice8Impl,iface);
     FIXME("(%p) : setting p[%u] <= RGBA(%02x,%02x,%02x,%02x)\n", This, PaletteNumber,
           pEntries->peRed, pEntries->peGreen, pEntries->peBlue, pEntries->peFlags);
+    if (PaletteNumber >= MAX_PALETTES) {
+        return D3DERR_INVALIDCALL;
+    }
     memcpy(This->palettes[PaletteNumber], pEntries, 256 * sizeof(PALETTEENTRY));
     return D3D_OK;
 }
 HRESULT  WINAPI  IDirect3DDevice8Impl_GetPaletteEntries(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber, PALETTEENTRY* pEntries) {
     ICOM_THIS(IDirect3DDevice8Impl,iface);
+    if (PaletteNumber >= MAX_PALETTES) {
+        return D3DERR_INVALIDCALL;
+    }
     memcpy(pEntries, This->palettes[PaletteNumber], 256 * sizeof(PALETTEENTRY));
     FIXME("(%p) : returning p[%u] => RGBA(%02x,%02x,%02x,%02x)\n", This, PaletteNumber,
           pEntries->peRed, pEntries->peGreen, pEntries->peBlue, pEntries->peFlags);
@@ -3598,6 +3604,9 @@
 HRESULT  WINAPI  IDirect3DDevice8Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber) {
     ICOM_THIS(IDirect3DDevice8Impl,iface);
     FIXME("(%p) : Setting to (%u)\n", This, PaletteNumber);
+    if (PaletteNumber >= MAX_PALETTES) {
+        return D3DERR_INVALIDCALL;
+    }
     This->currentPalette = PaletteNumber;
 
 #if defined(GL_EXT_paletted_texture)