commit ba0a53366941bb2db0c0d36c7440eb9e303f4f23
author James Abbatiello <abbeyj@wpi.edu> Tue Aug 22 20:38:00 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 22 20:38:00 2000 +0000
tree 2ad073614de8bb71a99b03991ad480c47917fc17
parent dbdd94ba4b807d4b30cc97378b736b4036a3a2ec

Don't crash when calling DirectDrawSurface::EnumAttachedSurfaces on a
surface with no attached surfaces.

dlls/ddraw/dsurface/main.c

diff --git a/dlls/ddraw/dsurface/main.c b/dlls/ddraw/dsurface/main.c
index 700b4c7..e91473c 100644
--- a/dlls/ddraw/dsurface/main.c
+++ b/dlls/ddraw/dsurface/main.c
@@ -867,10 +867,12 @@
     struct _surface_chain *chain = This->s.chain;
 
     TRACE("(%p)->(%p,%p)\n",This,context,esfcb);
-    for (i=0;i<chain->nrofsurfaces;i++) {
-      TRACE( "Enumerating attached surface (%p)\n", chain->surfaces[i]);
-      if (esfcb((LPDIRECTDRAWSURFACE) chain->surfaces[i], &(chain->surfaces[i]->s.surface_desc), context) == DDENUMRET_CANCEL)
-	return DD_OK; /* FIXME: return value correct? */
+    if (chain) {
+	for (i=0;i<chain->nrofsurfaces;i++) {
+	    TRACE( "Enumerating attached surface (%p)\n", chain->surfaces[i]);
+	    if (esfcb((LPDIRECTDRAWSURFACE) chain->surfaces[i], &(chain->surfaces[i]->s.surface_desc), context) == DDENUMRET_CANCEL)
+		return DD_OK; /* FIXME: return value correct? */
+	}
     }
     return DD_OK;
 }