Module: wine Branch: master Commit: bef60f1dfc4f9531f9197abf855262315f1defe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef60f1dfc4f9531f9197abf85...
Author: Markus Amsler markus.amsler@oribi.org Date: Thu Nov 9 02:38:22 2006 +0100
d3d8: Backport null pointer check in SetCursorProperties.
---
dlls/d3d8/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8b20920..68b0dff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -185,6 +185,10 @@ static HRESULT WINAPI IDirect3DDevice8Im IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DSurface8Impl *pSurface = (IDirect3DSurface8Impl*)pCursorBitmap; TRACE("(%p) Relay\n", This); + if(!pCursorBitmap) { + WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } return IWineD3DDevice_SetCursorProperties(This->WineD3DDevice,XHotSpot,YHotSpot,(IWineD3DSurface*)pSurface->wineD3DSurface); }